From 8209066c4c5ed26662fc9e9a35ad02064740959a Mon Sep 17 00:00:00 2001 From: Roman Bednar Date: Tue, 25 Oct 2022 15:25:24 +0200 Subject: [PATCH 1/2] graduate RetroactiveDefaultStorageClass to beta Change feature to beta and remove e2e test feature flags since they're not needed anymore. --- pkg/features/kube_features.go | 2 +- test/e2e/storage/pvc_storageclass.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 6ae2eb086bd..e58fbab0087 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1003,7 +1003,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha}, - RetroactiveDefaultStorageClass: {Default: false, PreRelease: featuregate.Alpha}, + RetroactiveDefaultStorageClass: {Default: true, PreRelease: featuregate.Beta}, RotateKubeletServerCertificate: {Default: true, PreRelease: featuregate.Beta}, diff --git a/test/e2e/storage/pvc_storageclass.go b/test/e2e/storage/pvc_storageclass.go index a611b9e645a..ba38bbbf22f 100644 --- a/test/e2e/storage/pvc_storageclass.go +++ b/test/e2e/storage/pvc_storageclass.go @@ -60,7 +60,7 @@ var _ = utils.SIGDescribe("Persistent Volume Claim and StorageClass", func() { } }) - ginkgo.Describe("Retroactive StorageClass assignment [Serial][Disruptive][Feature:RetroactiveDefaultStorageClass]", func() { + ginkgo.Describe("Retroactive StorageClass assignment [Serial][Disruptive]", func() { ginkgo.It("should assign default SC to PVCs that have no SC set", func(ctx context.Context) { // Temporarily set all default storage classes as non-default From 8d48c107a7c10e285568a90a1e93d9e1d26fb827 Mon Sep 17 00:00:00 2001 From: Roman Bednar Date: Wed, 2 Nov 2022 10:14:58 +0100 Subject: [PATCH 2/2] fix unit tests --- pkg/apis/core/validation/validation_test.go | 25 ++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index f2be3cbc805..29c985a216a 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -2440,40 +2440,45 @@ func TestValidationOptionsForPersistentVolumeClaim(t *testing.T) { oldPvc: nil, enableReadWriteOncePod: true, expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ - AllowReadWriteOncePod: true, - EnableRecoverFromExpansionFailure: false, + AllowReadWriteOncePod: true, + EnableRecoverFromExpansionFailure: false, + EnableRetroactiveDefaultStorageClass: true, }, }, "rwop allowed because feature enabled": { oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOnce}), enableReadWriteOncePod: true, expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ - AllowReadWriteOncePod: true, - EnableRecoverFromExpansionFailure: false, + AllowReadWriteOncePod: true, + EnableRecoverFromExpansionFailure: false, + EnableRetroactiveDefaultStorageClass: true, }, }, "rwop not allowed because not used and feature disabled": { oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOnce}), enableReadWriteOncePod: false, expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ - AllowReadWriteOncePod: false, - EnableRecoverFromExpansionFailure: false, + AllowReadWriteOncePod: false, + EnableRecoverFromExpansionFailure: false, + EnableRetroactiveDefaultStorageClass: true, }, }, "rwop allowed because used and feature enabled": { oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOncePod}), enableReadWriteOncePod: true, expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ - AllowReadWriteOncePod: true, - EnableRecoverFromExpansionFailure: false, + AllowReadWriteOncePod: true, + EnableRecoverFromExpansionFailure: false, + EnableRetroactiveDefaultStorageClass: true, }, }, "rwop allowed because used and feature disabled": { oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOncePod}), enableReadWriteOncePod: false, expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ - AllowReadWriteOncePod: true, - EnableRecoverFromExpansionFailure: false, + AllowReadWriteOncePod: true, + EnableRecoverFromExpansionFailure: false, + EnableRetroactiveDefaultStorageClass: true, }, }, }