From 9dff2311eacbcde1390ad67233cf0a48f0020eea Mon Sep 17 00:00:00 2001 From: Cici Huang Date: Thu, 29 Sep 2022 18:45:14 +0000 Subject: [PATCH 1/2] Add feature gate CelValidatingAdmissionExtensibility --- pkg/features/kube_features.go | 2 ++ .../src/k8s.io/apiserver/pkg/features/kube_features.go | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 1e920aa3c66..2d9eba01234 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1026,6 +1026,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, + genericfeatures.CelValidatingAdmissionExtensibility: {Default: false, PreRelease: featuregate.Alpha}, + genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.DryRun: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28 diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index b7ccda10445..3d9718e4f02 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -88,6 +88,13 @@ const ( // audited. AdvancedAuditing featuregate.Feature = "AdvancedAuditing" + // owner: @cici37 @jpbetz + // kep: http://kep.k8s.io/3488 + // alpha: v1.26 + // + // Enables expression validation in Admission Control + CelValidatingAdmissionExtensibility featuregate.Feature = "CelValidatingAdmissionExtensibility" + // owner: @cici37 // kep: http://kep.k8s.io/2876 // alpha: v1.23 @@ -215,6 +222,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, + CelValidatingAdmissionExtensibility: {Default: false, PreRelease: featuregate.Alpha}, + CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta}, DryRun: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28 From d8ab3fea0d5f91e273fcb3b49cffb71d1b70f7e3 Mon Sep 17 00:00:00 2001 From: Cici Huang Date: Wed, 5 Oct 2022 19:40:50 +0000 Subject: [PATCH 2/2] Update feature gate name to CELValidatingAdmission --- pkg/features/kube_features.go | 2 +- staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 2d9eba01234..b7a06789e8f 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1026,7 +1026,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, - genericfeatures.CelValidatingAdmissionExtensibility: {Default: false, PreRelease: featuregate.Alpha}, + genericfeatures.CELValidatingAdmission: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta}, diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index 3d9718e4f02..99608bad3ca 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -93,7 +93,7 @@ const ( // alpha: v1.26 // // Enables expression validation in Admission Control - CelValidatingAdmissionExtensibility featuregate.Feature = "CelValidatingAdmissionExtensibility" + CELValidatingAdmission featuregate.Feature = "CELValidatingAdmission" // owner: @cici37 // kep: http://kep.k8s.io/2876 @@ -222,7 +222,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, - CelValidatingAdmissionExtensibility: {Default: false, PreRelease: featuregate.Alpha}, + CELValidatingAdmission: {Default: false, PreRelease: featuregate.Alpha}, CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta},