diff --git a/pkg/apis/admissionregistration/validation/validation.go b/pkg/apis/admissionregistration/validation/validation.go index 32d14cc2253..78b5c8cc869 100644 --- a/pkg/apis/admissionregistration/validation/validation.go +++ b/pkg/apis/admissionregistration/validation/validation.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" - plugincel "k8s.io/apiserver/pkg/admission/plugin/cel" + plugincel "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" "k8s.io/apiserver/pkg/cel" "k8s.io/apiserver/pkg/util/webhook" "k8s.io/kubernetes/pkg/apis/admissionregistration" diff --git a/pkg/kubeapiserver/options/plugins.go b/pkg/kubeapiserver/options/plugins.go index 9501de708d9..96ae7bbdcaf 100644 --- a/pkg/kubeapiserver/options/plugins.go +++ b/pkg/kubeapiserver/options/plugins.go @@ -20,7 +20,7 @@ package options // This should probably be part of some configuration fed into the build for a // given binary target. import ( - validatingpolicy "k8s.io/apiserver/pkg/admission/plugin/cel" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" // Admission policies "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages" @@ -97,11 +97,11 @@ var AllOrderedPlugins = []string{ // new admission plugins should generally be inserted above here // webhook, resourcequota, and deny plugins must go at the end - mutatingwebhook.PluginName, // MutatingAdmissionWebhook - validatingpolicy.PluginName, // ValidatingAdmissionPolicy - validatingwebhook.PluginName, // ValidatingAdmissionWebhook - resourcequota.PluginName, // ResourceQuota - deny.PluginName, // AlwaysDeny + mutatingwebhook.PluginName, // MutatingAdmissionWebhook + validatingadmissionpolicy.PluginName, // ValidatingAdmissionPolicy + validatingwebhook.PluginName, // ValidatingAdmissionWebhook + resourcequota.PluginName, // ResourceQuota + deny.PluginName, // AlwaysDeny } // RegisterAllAdmissionPlugins registers all admission plugins. @@ -161,7 +161,7 @@ func DefaultOffAdmissionPlugins() sets.String { certsubjectrestriction.PluginName, // CertificateSubjectRestriction defaultingressclass.PluginName, // DefaultIngressClass podsecurity.PluginName, // PodSecurity - validatingpolicy.PluginName, // ValidatingAdmissionPolicy, only active when feature gate CELValidatingAdmission is enabled + validatingadmissionpolicy.PluginName, // ValidatingAdmissionPolicy, only active when feature gate CELValidatingAdmission is enabled ) return sets.NewString(AllOrderedPlugins...).Difference(defaultOnPlugins) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/OWNERS b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/OWNERS similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/OWNERS rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/OWNERS diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission.go index a2e14542400..7a753edd0f7 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "context" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go index 063533fa2a5..7f46a381cda 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "context" @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/initializer" - "k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/apiserver/pkg/features" dynamicfake "k8s.io/client-go/dynamic/fake" "k8s.io/client-go/informers" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/compiler.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/compiler.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/compiler.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/compiler.go index 3adb6623e5c..3767c0d9d1c 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/compiler.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/compiler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "sync" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/compiler_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/compiler_test.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/compiler_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/compiler_test.go index 3bae35a22ed..f60efb775df 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/compiler_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/compiler_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "strings" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/controller.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/controller.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go index 690e881e199..4398aa6b133 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/controller.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "context" @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apiserver/pkg/admission/plugin/cel/matching" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching" "k8s.io/api/admissionregistration/v1alpha1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" celmetrics "k8s.io/apiserver/pkg/admission/cel" - "k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/client-go/dynamic" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/controller_reconcile.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/controller_reconcile.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go index 321d17bd701..cbc89b518d6 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/controller_reconcile.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "context" @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" celmetrics "k8s.io/apiserver/pkg/admission/cel" - "k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/client-go/dynamic/dynamicinformer" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/initializer.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/initializer.go similarity index 96% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/initializer.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/initializer.go index f35bd571663..563bb69de10 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/initializer.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/initializer.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "context" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/interface.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/interface.go index 8a20110d48e..217d6bfc47c 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/interface.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "k8s.io/api/admissionregistration/v1alpha1" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/controller.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/controller.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/controller_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller_test.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/controller_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller_test.go index ad78dfbabfc..2d3af72f084 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/controller_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/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/cel/internal/generic" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/doc.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/doc.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/doc.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/informer.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/informer.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/informer.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/informer.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/interface.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/interface.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/interface.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/interface.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/lister.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/lister.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/internal/generic/lister.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/lister.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/matching/matching.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching/matching.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/matching/matching.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching/matching.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/matching/matching_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching/matching_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/matching/matching_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching/matching_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/policy_decision.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/policy_decision.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go index daaefd03539..1018743705b 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/policy_decision.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "net/http" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/validator.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator.go similarity index 98% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/validator.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator.go index dd8f6a6df3a..033d2e48e15 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/validator.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "fmt" @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/cel/matching" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching" "k8s.io/apiserver/pkg/admission/plugin/webhook/generic" ) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/validator_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go similarity index 99% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/validator_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go index 6905358a7fb..fff818bee94 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/validator_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cel +package validatingadmissionpolicy import ( "strings" diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go index 1159e297d65..5ee0036de1f 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go @@ -28,8 +28,8 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/initializer" admissionmetrics "k8s.io/apiserver/pkg/admission/metrics" - "k8s.io/apiserver/pkg/admission/plugin/cel" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" 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" @@ -87,7 +87,7 @@ func NewAdmissionOptions() *AdmissionOptions { // admission plugins. The apiserver always runs the validating ones // after all the mutating ones, so their relative order in this list // doesn't matter. - RecommendedPluginOrder: []string{lifecycle.PluginName, mutatingwebhook.PluginName, cel.PluginName, validatingwebhook.PluginName}, + RecommendedPluginOrder: []string{lifecycle.PluginName, mutatingwebhook.PluginName, validatingadmissionpolicy.PluginName, validatingwebhook.PluginName}, DefaultOffPlugins: sets.NewString(), } server.RegisterAllAdmissionPlugins(options.Plugins) diff --git a/staging/src/k8s.io/apiserver/pkg/server/plugins.go b/staging/src/k8s.io/apiserver/pkg/server/plugins.go index adb83a908ef..25acf92dc87 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/plugins.go +++ b/staging/src/k8s.io/apiserver/pkg/server/plugins.go @@ -19,8 +19,8 @@ package server // This file exists to force the desired plugin implementations to be linked into genericapi pkg. import ( "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/cel" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" + "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating" validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating" ) @@ -30,5 +30,5 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { lifecycle.Register(plugins) validatingwebhook.Register(plugins) mutatingwebhook.Register(plugins) - cel.Register(plugins) + validatingadmissionpolicy.Register(plugins) }