From 57e06e43f701c29fe94ace39b2466f55275f8f75 Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Wed, 17 Jan 2024 18:09:30 -0800 Subject: [PATCH] refactor: move vap into parent `policy` folder also renames to remove stutter comment Kubernetes-commit: 8b14116509ac19234924878ab08f7e9e8f03549a --- .../internal/generic/controller.go | 0 .../internal/generic/controller_test.go | 2 +- .../internal/generic/doc.go | 0 .../internal/generic/informer.go | 4 ++++ .../internal/generic/interface.go | 0 .../internal/generic/lister.go | 0 .../validating}/OWNERS | 0 .../validating}/admission.go | 2 +- .../validating}/admission_test.go | 4 ++-- .../validating}/caching_authorizer.go | 2 +- .../validating}/caching_authorizer_test.go | 2 +- .../validating}/controller.go | 8 ++++---- .../validating}/controller_reconcile.go | 6 +++--- .../validating}/initializer.go | 2 +- .../validating}/interface.go | 2 +- .../validating}/matcher.go | 4 ++-- .../validating}/message.go | 2 +- .../validating}/metrics/metrics.go | 0 .../validating}/metrics/metrics_test.go | 0 .../validating}/policy_decision.go | 2 +- .../validating}/typechecking.go | 2 +- .../validating}/typechecking_test.go | 2 +- .../validating}/validator.go | 2 +- .../validating}/validator_test.go | 2 +- .../validatingadmissionpolicy/matching/matching.go | 0 .../validatingadmissionpolicy/matching/matching_test.go | 0 pkg/server/options/admission.go | 2 +- pkg/server/plugins.go | 2 +- 28 files changed, 29 insertions(+), 25 deletions(-) rename pkg/admission/plugin/{validatingadmissionpolicy => policy}/internal/generic/controller.go (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy}/internal/generic/controller_test.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy}/internal/generic/doc.go (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy}/internal/generic/informer.go (79%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy}/internal/generic/interface.go (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy}/internal/generic/lister.go (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/OWNERS (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/admission.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/admission_test.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/caching_authorizer.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/caching_authorizer_test.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/controller.go (98%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/controller_reconcile.go (98%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/initializer.go (96%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/interface.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/matcher.go (96%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/message.go (96%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/metrics/metrics.go (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/metrics/metrics_test.go (100%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/policy_decision.go (98%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/typechecking.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/typechecking_test.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/validator.go (99%) rename pkg/admission/plugin/{validatingadmissionpolicy => policy/validating}/validator_test.go (99%) rename pkg/admission/plugin/{ => policy}/validatingadmissionpolicy/matching/matching.go (100%) rename pkg/admission/plugin/{ => policy}/validatingadmissionpolicy/matching/matching_test.go (100%) diff --git a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller.go b/pkg/admission/plugin/policy/internal/generic/controller.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller.go rename to pkg/admission/plugin/policy/internal/generic/controller.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller_test.go b/pkg/admission/plugin/policy/internal/generic/controller_test.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller_test.go rename to pkg/admission/plugin/policy/internal/generic/controller_test.go index cfd805750..ce277ed9d 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller_test.go +++ b/pkg/admission/plugin/policy/internal/generic/controller_test.go @@ -39,7 +39,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/doc.go b/pkg/admission/plugin/policy/internal/generic/doc.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/internal/generic/doc.go rename to pkg/admission/plugin/policy/internal/generic/doc.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/informer.go b/pkg/admission/plugin/policy/internal/generic/informer.go similarity index 79% rename from pkg/admission/plugin/validatingadmissionpolicy/internal/generic/informer.go rename to pkg/admission/plugin/policy/internal/generic/informer.go index 3025aa195..acb6316ec 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/informer.go +++ b/pkg/admission/plugin/policy/internal/generic/informer.go @@ -28,6 +28,10 @@ type informer[T runtime.Object] struct { lister[T] } +// Creates a generic informer around a type-erased cache.SharedIndexInformer +// It is incumbent on the caller to ensure that the generic type argument is +// consistent with the type of the objects stored inside the SharedIndexInformer +// as they will be casted. func NewInformer[T runtime.Object](informe cache.SharedIndexInformer) Informer[T] { return informer[T]{ SharedIndexInformer: informe, diff --git a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/interface.go b/pkg/admission/plugin/policy/internal/generic/interface.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/internal/generic/interface.go rename to pkg/admission/plugin/policy/internal/generic/interface.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/lister.go b/pkg/admission/plugin/policy/internal/generic/lister.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/internal/generic/lister.go rename to pkg/admission/plugin/policy/internal/generic/lister.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/OWNERS b/pkg/admission/plugin/policy/validating/OWNERS similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/OWNERS rename to pkg/admission/plugin/policy/validating/OWNERS diff --git a/pkg/admission/plugin/validatingadmissionpolicy/admission.go b/pkg/admission/plugin/policy/validating/admission.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/admission.go rename to pkg/admission/plugin/policy/validating/admission.go index e51bc6e73..6f9290bbe 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/admission.go +++ b/pkg/admission/plugin/policy/validating/admission.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go b/pkg/admission/plugin/policy/validating/admission_test.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/admission_test.go rename to pkg/admission/plugin/policy/validating/admission_test.go index f86b65535..8e26fa449 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go +++ b/pkg/admission/plugin/policy/validating/admission_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" @@ -45,7 +45,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/initializer" "k8s.io/apiserver/pkg/admission/plugin/cel" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic" "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" auditinternal "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authorization/authorizer" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer.go b/pkg/admission/plugin/policy/validating/caching_authorizer.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer.go rename to pkg/admission/plugin/policy/validating/caching_authorizer.go index a295cb30d..fbefd595e 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer.go +++ b/pkg/admission/plugin/policy/validating/caching_authorizer.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer_test.go b/pkg/admission/plugin/policy/validating/caching_authorizer_test.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer_test.go rename to pkg/admission/plugin/policy/validating/caching_authorizer_test.go index 9cef35fe4..da7f219fa 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer_test.go +++ b/pkg/admission/plugin/policy/validating/caching_authorizer_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/controller.go b/pkg/admission/plugin/policy/validating/controller.go similarity index 98% rename from pkg/admission/plugin/validatingadmissionpolicy/controller.go rename to pkg/admission/plugin/policy/validating/controller.go index a0e50edb5..c7943e69c 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/controller.go +++ b/pkg/admission/plugin/policy/validating/controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" @@ -37,9 +37,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching" - celmetrics "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics" + "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic" + 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/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go b/pkg/admission/plugin/policy/validating/controller_reconcile.go similarity index 98% rename from pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go rename to pkg/admission/plugin/policy/validating/controller_reconcile.go index 1924c14d9..cc2af50b5 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go +++ b/pkg/admission/plugin/policy/validating/controller_reconcile.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" @@ -32,8 +32,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission/plugin/cel" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" - celmetrics "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics" + "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic" + celmetrics "k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics" "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" "k8s.io/apiserver/pkg/cel/environment" "k8s.io/client-go/dynamic" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/initializer.go b/pkg/admission/plugin/policy/validating/initializer.go similarity index 96% rename from pkg/admission/plugin/validatingadmissionpolicy/initializer.go rename to pkg/admission/plugin/policy/validating/initializer.go index 15b757985..c7cb9c657 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/initializer.go +++ b/pkg/admission/plugin/policy/validating/initializer.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/interface.go b/pkg/admission/plugin/policy/validating/interface.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/interface.go rename to pkg/admission/plugin/policy/validating/interface.go index 206fc1378..33cbcce65 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/interface.go +++ b/pkg/admission/plugin/policy/validating/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/matcher.go b/pkg/admission/plugin/policy/validating/matcher.go similarity index 96% rename from pkg/admission/plugin/validatingadmissionpolicy/matcher.go rename to pkg/admission/plugin/policy/validating/matcher.go index 397f2c267..4f4ada91e 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/matcher.go +++ b/pkg/admission/plugin/policy/validating/matcher.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "k8s.io/api/admissionregistration/v1beta1" @@ -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/validatingadmissionpolicy/matching" + "k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching" ) var _ matching.MatchCriteria = &matchCriteria{} diff --git a/pkg/admission/plugin/validatingadmissionpolicy/message.go b/pkg/admission/plugin/policy/validating/message.go similarity index 96% rename from pkg/admission/plugin/validatingadmissionpolicy/message.go rename to pkg/admission/plugin/policy/validating/message.go index 772891e3c..8b7d97361 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/message.go +++ b/pkg/admission/plugin/policy/validating/message.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( celgo "github.com/google/cel-go/cel" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics.go b/pkg/admission/plugin/policy/validating/metrics/metrics.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics.go rename to pkg/admission/plugin/policy/validating/metrics/metrics.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics_test.go b/pkg/admission/plugin/policy/validating/metrics/metrics_test.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics_test.go rename to pkg/admission/plugin/policy/validating/metrics/metrics_test.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go b/pkg/admission/plugin/policy/validating/policy_decision.go similarity index 98% rename from pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go rename to pkg/admission/plugin/policy/validating/policy_decision.go index 939cbea70..3ea17038a 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go +++ b/pkg/admission/plugin/policy/validating/policy_decision.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "net/http" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/typechecking.go b/pkg/admission/plugin/policy/validating/typechecking.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/typechecking.go rename to pkg/admission/plugin/policy/validating/typechecking.go index d4a1bf825..d54d3b667 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/typechecking.go +++ b/pkg/admission/plugin/policy/validating/typechecking.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "errors" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/typechecking_test.go b/pkg/admission/plugin/policy/validating/typechecking_test.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/typechecking_test.go rename to pkg/admission/plugin/policy/validating/typechecking_test.go index 67a0e98ae..95bf748cc 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/typechecking_test.go +++ b/pkg/admission/plugin/policy/validating/typechecking_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "fmt" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/validator.go b/pkg/admission/plugin/policy/validating/validator.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/validator.go rename to pkg/admission/plugin/policy/validating/validator.go index 9630a4974..64d5fdc47 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/validator.go +++ b/pkg/admission/plugin/policy/validating/validator.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go b/pkg/admission/plugin/policy/validating/validator_test.go similarity index 99% rename from pkg/admission/plugin/validatingadmissionpolicy/validator_test.go rename to pkg/admission/plugin/policy/validating/validator_test.go index d1e5753af..ba4f1ca86 100644 --- a/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go +++ b/pkg/admission/plugin/policy/validating/validator_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package validatingadmissionpolicy +package validating import ( "context" diff --git a/pkg/admission/plugin/validatingadmissionpolicy/matching/matching.go b/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/matching/matching.go rename to pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching.go diff --git a/pkg/admission/plugin/validatingadmissionpolicy/matching/matching_test.go b/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching_test.go similarity index 100% rename from pkg/admission/plugin/validatingadmissionpolicy/matching/matching_test.go rename to pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching_test.go diff --git a/pkg/server/options/admission.go b/pkg/server/options/admission.go index 6f4990a7e..3f65a0d1f 100644 --- a/pkg/server/options/admission.go +++ b/pkg/server/options/admission.go @@ -29,7 +29,7 @@ import ( "k8s.io/apiserver/pkg/admission/initializer" admissionmetrics "k8s.io/apiserver/pkg/admission/metrics" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" + validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating" mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating" validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating" apiserverapi "k8s.io/apiserver/pkg/apis/apiserver" diff --git a/pkg/server/plugins.go b/pkg/server/plugins.go index 25acf92dc..239044641 100644 --- a/pkg/server/plugins.go +++ b/pkg/server/plugins.go @@ -20,7 +20,7 @@ package server import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" - "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" + validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating" mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating" validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating" )