github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Rename FG to ValidatingAdmissionPolicy

Browse Source
This commit is contained in:
Cici Huang 2022-11-09 17:27:20 +00:00
parent e81820dd20
commit 2973712486
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/features/kube_features.go
View File

@ -1134,7 +1134,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
genericfeatures.AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, genericfeatures.AdvancedAuditing: {Default: true, PreRelease: featuregate.GA},
genericfeatures.CELValidatingAdmission: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.ValidatingAdmissionPolicy: {Default: false, PreRelease: featuregate.Alpha},
genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta},

2
pkg/kubeapiserver/options/plugins.go
View File

@ -161,7 +161,7 @@ func DefaultOffAdmissionPlugins() sets.String {
certsubjectrestriction.PluginName, // CertificateSubjectRestriction certsubjectrestriction.PluginName, // CertificateSubjectRestriction
defaultingressclass.PluginName, // DefaultIngressClass defaultingressclass.PluginName, // DefaultIngressClass
podsecurity.PluginName, // PodSecurity podsecurity.PluginName, // PodSecurity
validatingadmissionpolicy.PluginName, // ValidatingAdmissionPolicy, only active when feature gate CELValidatingAdmission is enabled validatingadmissionpolicy.PluginName, // ValidatingAdmissionPolicy, only active when feature gate ValidatingAdmissionPolicy is enabled
) )
return sets.NewString(AllOrderedPlugins...).Difference(defaultOnPlugins) return sets.NewString(AllOrderedPlugins...).Difference(defaultOnPlugins)

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission.go
View File

@ -109,7 +109,7 @@ func (c *celAdmissionPlugin) SetDrainedNotification(stopCh <-chan struct{}) {
} }
func (c *celAdmissionPlugin) InspectFeatureGates(featureGates featuregate.FeatureGate) { func (c *celAdmissionPlugin) InspectFeatureGates(featureGates featuregate.FeatureGate) {
if featureGates.Enabled(features.CELValidatingAdmission) { if featureGates.Enabled(features.ValidatingAdmissionPolicy) {
c.enabled = true c.enabled = true
} }
c.inspectedFeatureGates = true c.inspectedFeatureGates = true

4
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go
View File

@ -249,13 +249,13 @@ func setupTestCommon(t *testing.T, compiler ValidatorCompiler, shouldStartInform
fakeInformerFactory := informers.NewSharedInformerFactory(fakeClient, time.Second) fakeInformerFactory := informers.NewSharedInformerFactory(fakeClient, time.Second)
featureGate := featuregate.NewFeatureGate() featureGate := featuregate.NewFeatureGate()
err := featureGate.Add(map[featuregate.Feature]featuregate.FeatureSpec{ err := featureGate.Add(map[featuregate.Feature]featuregate.FeatureSpec{
features.CELValidatingAdmission: { features.ValidatingAdmissionPolicy: {
Default: true, PreRelease: featuregate.Alpha}}) Default: true, PreRelease: featuregate.Alpha}})
if err != nil { if err != nil {
// FIXME: handle error. // FIXME: handle error.
panic("Unexpected error") panic("Unexpected error")
} }
err = featureGate.SetFromMap(map[string]bool{string(features.CELValidatingAdmission): true}) err = featureGate.SetFromMap(map[string]bool{string(features.ValidatingAdmissionPolicy): true})
if err != nil { if err != nil {
// FIXME: handle error. // FIXME: handle error.
panic("Unexpected error.") panic("Unexpected error.")

4
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View File

@ -93,7 +93,7 @@ const (
// alpha: v1.26 // alpha: v1.26
// //
// Enables expression validation in Admission Control // Enables expression validation in Admission Control
CELValidatingAdmission featuregate.Feature = "CELValidatingAdmission" ValidatingAdmissionPolicy featuregate.Feature = "ValidatingAdmissionPolicy"
// owner: @cici37 // owner: @cici37
// kep: https://kep.k8s.io/2876 // kep: https://kep.k8s.io/2876
@ -222,7 +222,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, AdvancedAuditing: {Default: true, PreRelease: featuregate.GA},
CELValidatingAdmission: {Default: false, PreRelease: featuregate.Alpha}, ValidatingAdmissionPolicy: {Default: false, PreRelease: featuregate.Alpha},
CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta}, CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta},

6
test/integration/apiserver/cel/validatingadmissionpolicy_test.go
View File

@ -166,7 +166,7 @@ func Test_ValidateNamespace_NoParams(t *testing.T) {
for _, testcase := range testcases { for _, testcase := range testcases {
t.Run(testcase.name, func(t *testing.T) { t.Run(testcase.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CELValidatingAdmission, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ValidatingAdmissionPolicy, true)()
server, err := apiservertesting.StartTestServer(t, nil, []string{ server, err := apiservertesting.StartTestServer(t, nil, []string{
"--enable-admission-plugins", "ValidatingAdmissionPolicy", "--enable-admission-plugins", "ValidatingAdmissionPolicy",
}, framework.SharedEtcd()) }, framework.SharedEtcd())
@ -270,7 +270,7 @@ func Test_ValidateNamespace_WithConfigMapParams(t *testing.T) {
for _, testcase := range testcases { for _, testcase := range testcases {
t.Run(testcase.name, func(t *testing.T) { t.Run(testcase.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CELValidatingAdmission, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ValidatingAdmissionPolicy, true)()
server, err := apiservertesting.StartTestServer(t, nil, []string{ server, err := apiservertesting.StartTestServer(t, nil, []string{
"--enable-admission-plugins", "ValidatingAdmissionPolicy", "--enable-admission-plugins", "ValidatingAdmissionPolicy",
}, framework.SharedEtcd()) }, framework.SharedEtcd())
@ -327,7 +327,7 @@ func Test_ValidateNamespace_WithConfigMapParams(t *testing.T) {
} }
func TestMultiplePolicyBindings(t *testing.T) { func TestMultiplePolicyBindings(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CELValidatingAdmission, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ValidatingAdmissionPolicy, true)()
server, err := apiservertesting.StartTestServer(t, nil, nil, framework.SharedEtcd()) server, err := apiservertesting.StartTestServer(t, nil, nil, framework.SharedEtcd())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)