github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

feature: promote CRDValidationRatcheting to beta

Browse Source 
also fixup test which needs feature to be disabled
it was set to enable by default in this CL
This commit is contained in:
Alexander Zielenski 2023-10-23 17:53:42 -07:00
parent 02aaad0de9
commit 768c169dd8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/features/kube_features.go
View File

@ -1212,7 +1212,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
// inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed // inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side: // unintentionally on either side:
apiextensionsfeatures.CRDValidationRatcheting: {Default: false, PreRelease: featuregate.Alpha}, apiextensionsfeatures.CRDValidationRatcheting: {Default: true, PreRelease: featuregate.Beta},
// features that enable backwards compatibility but are scheduled to be removed // features that enable backwards compatibility but are scheduled to be removed
// ... // ...

2
staging/src/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go
View File

@ -44,5 +44,5 @@ func init() {
// To add a new feature, define a key for it above and add it here. The features will be // To add a new feature, define a key for it above and add it here. The features will be
// available throughout Kubernetes binaries. // available throughout Kubernetes binaries.
var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
CRDValidationRatcheting: {Default: false, PreRelease: featuregate.Alpha}, CRDValidationRatcheting: {Default: true, PreRelease: featuregate.Beta},
} }

3
staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test.go
View File

@ -1952,6 +1952,8 @@ func BenchmarkRatcheting(b *testing.B) {
} }
func TestRatchetingDropFields(t *testing.T) { func TestRatchetingDropFields(t *testing.T) {
// Field dropping only takes effect when feature is disabled
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CRDValidationRatcheting, false)()
tearDown, apiExtensionClient, _, err := fixtures.StartDefaultServerWithClients(t) tearDown, apiExtensionClient, _, err := fixtures.StartDefaultServerWithClients(t)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -1982,6 +1984,7 @@ func TestRatchetingDropFields(t *testing.T) {
Type: "string", Type: "string",
XValidations: []apiextensionsv1.ValidationRule{ XValidations: []apiextensionsv1.ValidationRule{
{ {
// Results in error if field wasn't dropped
Rule: "self == oldSelf", Rule: "self == oldSelf",
OptionalOldSelf: ptr(true), OptionalOldSelf: ptr(true),
}, },