From d697f43d73870679ad4cd46939ad28e06926b6d3 Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Wed, 17 Jan 2024 18:12:41 -0800 Subject: [PATCH] refactor: move matching logic into parent policy folder --- .../policy/{validatingadmissionpolicy => }/matching/matching.go | 0 .../{validatingadmissionpolicy => }/matching/matching_test.go | 0 .../pkg/admission/plugin/policy/validating/controller.go | 2 +- .../apiserver/pkg/admission/plugin/policy/validating/matcher.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/{validatingadmissionpolicy => }/matching/matching.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/{validatingadmissionpolicy => }/matching/matching_test.go (100%) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/matching/matching.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/matching/matching.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/matching/matching_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/matching/matching_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/controller.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/controller.go index c7943e69cb3..c5c1ffd6063 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/controller.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/controller.go @@ -38,8 +38,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/policy/matching" celmetrics "k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics" - "k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching" celconfig "k8s.io/apiserver/pkg/apis/cel" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/warning" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/matcher.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/matcher.go index 4f4ada91e0b..9d667e46edf 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/matcher.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/matcher.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching" + "k8s.io/apiserver/pkg/admission/plugin/policy/matching" ) var _ matching.MatchCriteria = &matchCriteria{}