diff --git a/cmd/cli/kubectl-kyverno/exception/load.go b/cmd/cli/kubectl-kyverno/exception/load.go index 4412fd978a..bdda414252 100644 --- a/cmd/cli/kubectl-kyverno/exception/load.go +++ b/cmd/cli/kubectl-kyverno/exception/load.go @@ -6,8 +6,8 @@ import ( kyvernov2alpha1 "github.com/kyverno/kyverno/api/kyverno/v2alpha1" kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/data" - "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/convert" resourceloader "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/loader" + "github.com/kyverno/kyverno/ext/resource/convert" yamlutils "github.com/kyverno/kyverno/ext/yaml" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/kubectl-validate/pkg/openapiclient" diff --git a/cmd/cli/kubectl-kyverno/policy/load.go b/cmd/cli/kubectl-kyverno/policy/load.go index b6b7883901..4bfc70bd60 100644 --- a/cmd/cli/kubectl-kyverno/policy/load.go +++ b/cmd/cli/kubectl-kyverno/policy/load.go @@ -14,9 +14,9 @@ import ( kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/data" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/experimental" - "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/convert" resourceloader "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/loader" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/source" + "github.com/kyverno/kyverno/ext/resource/convert" extyaml "github.com/kyverno/kyverno/ext/yaml" "github.com/kyverno/kyverno/pkg/utils/git" yamlutils "github.com/kyverno/kyverno/pkg/utils/yaml" diff --git a/cmd/cli/kubectl-kyverno/resource/load.go b/cmd/cli/kubectl-kyverno/resource/load.go index 26864c170b..9fbc64ba49 100644 --- a/cmd/cli/kubectl-kyverno/resource/load.go +++ b/cmd/cli/kubectl-kyverno/resource/load.go @@ -1,8 +1,8 @@ package resource import ( - "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/convert" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/resource/loader" + "github.com/kyverno/kyverno/ext/resource/convert" ) func Load[T any](l loader.Loader, content []byte) (*T, error) { diff --git a/cmd/cli/kubectl-kyverno/resource/convert/convert.go b/ext/resource/convert/convert.go similarity index 100% rename from cmd/cli/kubectl-kyverno/resource/convert/convert.go rename to ext/resource/convert/convert.go diff --git a/cmd/cli/kubectl-kyverno/resource/convert/convert_test.go b/ext/resource/convert/convert_test.go similarity index 79% rename from cmd/cli/kubectl-kyverno/resource/convert/convert_test.go rename to ext/resource/convert/convert_test.go index 1b7a9d9db1..b11889b3a7 100644 --- a/cmd/cli/kubectl-kyverno/resource/convert/convert_test.go +++ b/ext/resource/convert/convert_test.go @@ -12,7 +12,7 @@ import ( func TestTo(t *testing.T) { { - data, err := os.ReadFile("../../_testdata/policies/check-image.yaml") + data, err := os.ReadFile("../../../cmd/cli/kubectl-kyverno/_testdata/policies/check-image.yaml") require.NoError(t, err) json, err := yaml.YAMLToJSON(data) @@ -26,7 +26,7 @@ func TestTo(t *testing.T) { require.Error(t, err) } { - data, err := os.ReadFile("../../_testdata/resources/namespace.yaml") + data, err := os.ReadFile("../../../cmd/cli/kubectl-kyverno/_testdata/resources/namespace.yaml") require.NoError(t, err) json, err := yaml.YAMLToJSON(data)