diff --git a/api/kyverno/v1/rule_types.go b/api/kyverno/v1/rule_types.go index c0d26db287..4050eff483 100644 --- a/api/kyverno/v1/rule_types.go +++ b/api/kyverno/v1/rule_types.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/pss/utils" datautils "github.com/kyverno/kyverno/pkg/utils/data" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/api/kyverno/v2beta1/policy_exception_types.go b/api/kyverno/v2beta1/policy_exception_types.go index 6ce0396709..b6591cfb10 100644 --- a/api/kyverno/v2beta1/policy_exception_types.go +++ b/api/kyverno/v2beta1/policy_exception_types.go @@ -16,7 +16,7 @@ limitations under the License. package v2beta1 import ( - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/cmd/cli/kubectl-kyverno/test/filter/filter.go b/cmd/cli/kubectl-kyverno/test/filter/filter.go index 08e68d5603..2ed0beacbe 100644 --- a/cmd/cli/kubectl-kyverno/test/filter/filter.go +++ b/cmd/cli/kubectl-kyverno/test/filter/filter.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/apis/v1alpha1" - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" ) type Filter interface { diff --git a/pkg/utils/wildcard/match.go b/ext/wildcard/match.go similarity index 100% rename from pkg/utils/wildcard/match.go rename to ext/wildcard/match.go diff --git a/pkg/utils/wildcard/match_test.go b/ext/wildcard/match_test.go similarity index 100% rename from pkg/utils/wildcard/match_test.go rename to ext/wildcard/match_test.go diff --git a/pkg/utils/wildcard/utils.go b/ext/wildcard/utils.go similarity index 100% rename from pkg/utils/wildcard/utils.go rename to ext/wildcard/utils.go diff --git a/pkg/utils/wildcard/utils_test.go b/ext/wildcard/utils_test.go similarity index 100% rename from pkg/utils/wildcard/utils_test.go rename to ext/wildcard/utils_test.go diff --git a/pkg/clients/dclient/discovery.go b/pkg/clients/dclient/discovery.go index 9e55dd1fb1..fbb193ae35 100644 --- a/pkg/clients/dclient/discovery.go +++ b/pkg/clients/dclient/discovery.go @@ -7,8 +7,8 @@ import ( "time" openapiv2 "github.com/google/gnostic-models/openapiv2" + "github.com/kyverno/kyverno/ext/wildcard" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" - "github.com/kyverno/kyverno/pkg/utils/wildcard" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" diff --git a/pkg/clients/dclient/helpers.go b/pkg/clients/dclient/helpers.go index fc619e7dc7..c1c1c58f24 100644 --- a/pkg/clients/dclient/helpers.go +++ b/pkg/clients/dclient/helpers.go @@ -3,7 +3,7 @@ package dclient import ( "context" - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index 3838e0b19a..e423efab14 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -7,8 +7,8 @@ import ( "sync" valid "github.com/asaskevich/govalidator" + "github.com/kyverno/kyverno/ext/wildcard" osutils "github.com/kyverno/kyverno/pkg/utils/os" - "github.com/kyverno/kyverno/pkg/utils/wildcard" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/controllers/webhook/controller.go b/pkg/controllers/webhook/controller.go index 7ce1bc41f8..646aaa1baa 100644 --- a/pkg/controllers/webhook/controller.go +++ b/pkg/controllers/webhook/controller.go @@ -10,6 +10,7 @@ import ( "github.com/go-logr/logr" "github.com/kyverno/kyverno/api/kyverno" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/autogen" "github.com/kyverno/kyverno/pkg/client/clientset/versioned" kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1" @@ -21,7 +22,6 @@ import ( controllerutils "github.com/kyverno/kyverno/pkg/utils/controller" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" runtimeutils "github.com/kyverno/kyverno/pkg/utils/runtime" - "github.com/kyverno/kyverno/pkg/utils/wildcard" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" coordinationv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/cosign/cosign.go b/pkg/cosign/cosign.go index 44aaf855f4..69bec41c8f 100644 --- a/pkg/cosign/cosign.go +++ b/pkg/cosign/cosign.go @@ -12,10 +12,10 @@ import ( "github.com/google/go-containerregistry/pkg/name" "github.com/in-toto/in-toto-golang/in_toto" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/images" "github.com/kyverno/kyverno/pkg/tracing" datautils "github.com/kyverno/kyverno/pkg/utils/data" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" "github.com/sigstore/cosign/v2/pkg/cosign" "github.com/sigstore/cosign/v2/pkg/cosign/attestation" "github.com/sigstore/cosign/v2/pkg/oci" diff --git a/pkg/engine/api/engineresponse.go b/pkg/engine/api/engineresponse.go index bbc80b2d95..0577d383ea 100644 --- a/pkg/engine/api/engineresponse.go +++ b/pkg/engine/api/engineresponse.go @@ -4,9 +4,9 @@ import ( "fmt" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" datautils "github.com/kyverno/kyverno/pkg/utils/data" utils "github.com/kyverno/kyverno/pkg/utils/match" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "gomodules.xyz/jsonpatch/v2" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/engine/context/mock_context.go b/pkg/engine/context/mock_context.go index a3f66505fb..07f359f2fc 100644 --- a/pkg/engine/context/mock_context.go +++ b/pkg/engine/context/mock_context.go @@ -6,9 +6,9 @@ import ( "strings" "sync" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/config" "github.com/kyverno/kyverno/pkg/engine/jmespath" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" ) // MockContext is used for testing and validation of variables diff --git a/pkg/engine/handlers/mutation/load_targets.go b/pkg/engine/handlers/mutation/load_targets.go index e8c0f96d27..bcdbf3caa2 100644 --- a/pkg/engine/handlers/mutation/load_targets.go +++ b/pkg/engine/handlers/mutation/load_targets.go @@ -6,10 +6,10 @@ import ( "github.com/go-logr/logr" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" engineapi "github.com/kyverno/kyverno/pkg/engine/api" "github.com/kyverno/kyverno/pkg/engine/variables" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "go.uber.org/multierr" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/engine/internal/imageverifier.go b/pkg/engine/internal/imageverifier.go index bba729740d..e9bd2a130a 100644 --- a/pkg/engine/internal/imageverifier.go +++ b/pkg/engine/internal/imageverifier.go @@ -12,6 +12,7 @@ import ( "github.com/go-logr/logr" "github.com/kyverno/kyverno/api/kyverno" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/config" "github.com/kyverno/kyverno/pkg/cosign" engineapi "github.com/kyverno/kyverno/pkg/engine/api" @@ -22,7 +23,6 @@ import ( "github.com/kyverno/kyverno/pkg/notary" apiutils "github.com/kyverno/kyverno/pkg/utils/api" "github.com/kyverno/kyverno/pkg/utils/jsonpointer" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "go.uber.org/multierr" "gomodules.xyz/jsonpatch/v2" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/engine/jmespath/functions.go b/pkg/engine/jmespath/functions.go index 50e0c8dc3f..99c545e6d6 100644 --- a/pkg/engine/jmespath/functions.go +++ b/pkg/engine/jmespath/functions.go @@ -22,9 +22,9 @@ import ( trunc "github.com/aquilax/truncate" "github.com/blang/semver/v4" gojmespath "github.com/kyverno/go-jmespath" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/config" imageutils "github.com/kyverno/kyverno/pkg/utils/image" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" regen "github.com/zach-klippenstein/goregen" "golang.org/x/crypto/cryptobyte" cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" diff --git a/pkg/engine/pattern/pattern.go b/pkg/engine/pattern/pattern.go index a000edf2a6..3629a56283 100644 --- a/pkg/engine/pattern/pattern.go +++ b/pkg/engine/pattern/pattern.go @@ -9,8 +9,8 @@ import ( "time" "github.com/go-logr/logr" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/operator" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" apiresource "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/engine/utils/image.go b/pkg/engine/utils/image.go index 7652b82525..00be6afb05 100644 --- a/pkg/engine/utils/image.go +++ b/pkg/engine/utils/image.go @@ -7,11 +7,11 @@ import ( "github.com/go-logr/logr" "github.com/kyverno/kyverno/api/kyverno" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/config" engineapi "github.com/kyverno/kyverno/pkg/engine/api" enginecontext "github.com/kyverno/kyverno/pkg/engine/context" apiutils "github.com/kyverno/kyverno/pkg/utils/api" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/engine/utils/match.go b/pkg/engine/utils/match.go index 230eec99de..ce071a1f9c 100644 --- a/pkg/engine/utils/match.go +++ b/pkg/engine/utils/match.go @@ -6,9 +6,9 @@ import ( kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1" + "github.com/kyverno/kyverno/ext/wildcard" datautils "github.com/kyverno/kyverno/pkg/utils/data" matchutils "github.com/kyverno/kyverno/pkg/utils/match" - "github.com/kyverno/kyverno/pkg/utils/wildcard" authenticationv1 "k8s.io/api/authentication/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/engine/variables/operator/allin.go b/pkg/engine/variables/operator/allin.go index 7ecb7c877b..6497721f86 100644 --- a/pkg/engine/variables/operator/allin.go +++ b/pkg/engine/variables/operator/allin.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/go-logr/logr" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/context" "github.com/kyverno/kyverno/pkg/engine/operator" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" ) // NewAllInHandler returns handler to manage AllIn operations diff --git a/pkg/engine/variables/operator/anyin.go b/pkg/engine/variables/operator/anyin.go index af79d784bb..5bb5d791bf 100644 --- a/pkg/engine/variables/operator/anyin.go +++ b/pkg/engine/variables/operator/anyin.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/go-logr/logr" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/context" "github.com/kyverno/kyverno/pkg/engine/operator" "github.com/kyverno/kyverno/pkg/engine/pattern" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" ) // NewAnyInHandler returns handler to manage AnyIn operations diff --git a/pkg/engine/variables/operator/equal.go b/pkg/engine/variables/operator/equal.go index 0f52769066..2fa73623f2 100644 --- a/pkg/engine/variables/operator/equal.go +++ b/pkg/engine/variables/operator/equal.go @@ -6,9 +6,9 @@ import ( "strconv" "github.com/go-logr/logr" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/context" datautils "github.com/kyverno/kyverno/pkg/utils/data" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/engine/variables/operator/in.go b/pkg/engine/variables/operator/in.go index 0873193846..4e03a7c84b 100644 --- a/pkg/engine/variables/operator/in.go +++ b/pkg/engine/variables/operator/in.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/go-logr/logr" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/context" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" ) // NewInHandler returns handler to manage In operations diff --git a/pkg/engine/variables/operator/notequal.go b/pkg/engine/variables/operator/notequal.go index b79a69a552..84f0faf3b5 100644 --- a/pkg/engine/variables/operator/notequal.go +++ b/pkg/engine/variables/operator/notequal.go @@ -6,9 +6,9 @@ import ( "strconv" "github.com/go-logr/logr" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/context" datautils "github.com/kyverno/kyverno/pkg/utils/data" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/engine/wildcards/wildcards.go b/pkg/engine/wildcards/wildcards.go index 07430ed836..e6939ca4f1 100644 --- a/pkg/engine/wildcards/wildcards.go +++ b/pkg/engine/wildcards/wildcards.go @@ -3,8 +3,8 @@ package wildcards import ( "strings" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/engine/anchor" - wildcard "github.com/kyverno/kyverno/pkg/utils/wildcard" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/policy/generate/validate.go b/pkg/policy/generate/validate.go index e4eaa8dbc4..738810b1e6 100644 --- a/pkg/policy/generate/validate.go +++ b/pkg/policy/generate/validate.go @@ -7,11 +7,11 @@ import ( "github.com/go-logr/logr" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/clients/dclient" "github.com/kyverno/kyverno/pkg/engine/variables/regex" "github.com/kyverno/kyverno/pkg/policy/common" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" - "github.com/kyverno/kyverno/pkg/utils/wildcard" ) // Generate provides implementation to validate 'generate' rule diff --git a/pkg/policycache/cache.go b/pkg/policycache/cache.go index 180f8aa8e8..a000c0772f 100644 --- a/pkg/policycache/cache.go +++ b/pkg/policycache/cache.go @@ -2,8 +2,8 @@ package policycache import ( kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/clients/dclient" - "github.com/kyverno/kyverno/pkg/utils/wildcard" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/pss/evaluate.go b/pkg/pss/evaluate.go index e83a37b10f..3d125e7fff 100644 --- a/pkg/pss/evaluate.go +++ b/pkg/pss/evaluate.go @@ -4,8 +4,8 @@ import ( "fmt" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" pssutils "github.com/kyverno/kyverno/pkg/pss/utils" - "github.com/kyverno/kyverno/pkg/utils/wildcard" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/pod-security-admission/api" diff --git a/pkg/utils/kube/wildcard.go b/pkg/utils/kube/wildcard.go index 83e0b481d4..5e38bf4228 100644 --- a/pkg/utils/kube/wildcard.go +++ b/pkg/utils/kube/wildcard.go @@ -1,7 +1,7 @@ package kube import ( - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/utils/match/annotations.go b/pkg/utils/match/annotations.go index 96f89b683e..38c864321f 100644 --- a/pkg/utils/match/annotations.go +++ b/pkg/utils/match/annotations.go @@ -1,7 +1,7 @@ package match import ( - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" ) func CheckAnnotations(expected map[string]string, actual map[string]string) bool { diff --git a/pkg/utils/match/kind.go b/pkg/utils/match/kind.go index 9e03923b93..a611610e47 100644 --- a/pkg/utils/match/kind.go +++ b/pkg/utils/match/kind.go @@ -1,8 +1,8 @@ package match import ( + "github.com/kyverno/kyverno/ext/wildcard" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/utils/match/match.go b/pkg/utils/match/match.go index 243ce77bdb..6c73dd7b23 100644 --- a/pkg/utils/match/match.go +++ b/pkg/utils/match/match.go @@ -6,8 +6,8 @@ import ( kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1" kyvernov2beta1 "github.com/kyverno/kyverno/api/kyverno/v2beta1" + "github.com/kyverno/kyverno/ext/wildcard" datautils "github.com/kyverno/kyverno/pkg/utils/data" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "go.uber.org/multierr" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/utils/match/name.go b/pkg/utils/match/name.go index 85082372fb..ede1ff0f0c 100644 --- a/pkg/utils/match/name.go +++ b/pkg/utils/match/name.go @@ -1,7 +1,7 @@ package match import ( - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" ) func CheckName(expected, actual string) bool { diff --git a/pkg/utils/match/subjects.go b/pkg/utils/match/subjects.go index c1c2ac6a69..8cfb262862 100644 --- a/pkg/utils/match/subjects.go +++ b/pkg/utils/match/subjects.go @@ -1,7 +1,7 @@ package match import ( - "github.com/kyverno/kyverno/pkg/utils/wildcard" + "github.com/kyverno/kyverno/ext/wildcard" authenticationv1 "k8s.io/api/authentication/v1" rbacv1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/validation/policy/validate.go b/pkg/validation/policy/validate.go index 8d7a3e20ef..b6c54a5e10 100644 --- a/pkg/validation/policy/validate.go +++ b/pkg/validation/policy/validate.go @@ -16,6 +16,7 @@ import ( "github.com/kyverno/go-jmespath" "github.com/kyverno/kyverno/api/kyverno" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/ext/wildcard" "github.com/kyverno/kyverno/pkg/autogen" "github.com/kyverno/kyverno/pkg/clients/dclient" enginecontext "github.com/kyverno/kyverno/pkg/engine/context" @@ -25,7 +26,6 @@ import ( apiutils "github.com/kyverno/kyverno/pkg/utils/api" datautils "github.com/kyverno/kyverno/pkg/utils/data" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" - "github.com/kyverno/kyverno/pkg/utils/wildcard" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field"