Merge pull request #113329 from RomanBednar/retro-sc-beta

graduate RetroactiveDefaultStorageClass to beta
This commit is contained in:
Kubernetes Prow Robot 2022-11-02 08:35:14 -07:00 committed by GitHub
commit 06ba383532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions

View File

@ -2440,40 +2440,45 @@ func TestValidationOptionsForPersistentVolumeClaim(t *testing.T) {
oldPvc: nil, oldPvc: nil,
enableReadWriteOncePod: true, enableReadWriteOncePod: true,
expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{
AllowReadWriteOncePod: true, AllowReadWriteOncePod: true,
EnableRecoverFromExpansionFailure: false, EnableRecoverFromExpansionFailure: false,
EnableRetroactiveDefaultStorageClass: true,
}, },
}, },
"rwop allowed because feature enabled": { "rwop allowed because feature enabled": {
oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOnce}), oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOnce}),
enableReadWriteOncePod: true, enableReadWriteOncePod: true,
expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{
AllowReadWriteOncePod: true, AllowReadWriteOncePod: true,
EnableRecoverFromExpansionFailure: false, EnableRecoverFromExpansionFailure: false,
EnableRetroactiveDefaultStorageClass: true,
}, },
}, },
"rwop not allowed because not used and feature disabled": { "rwop not allowed because not used and feature disabled": {
oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOnce}), oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOnce}),
enableReadWriteOncePod: false, enableReadWriteOncePod: false,
expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{
AllowReadWriteOncePod: false, AllowReadWriteOncePod: false,
EnableRecoverFromExpansionFailure: false, EnableRecoverFromExpansionFailure: false,
EnableRetroactiveDefaultStorageClass: true,
}, },
}, },
"rwop allowed because used and feature enabled": { "rwop allowed because used and feature enabled": {
oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOncePod}), oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOncePod}),
enableReadWriteOncePod: true, enableReadWriteOncePod: true,
expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{
AllowReadWriteOncePod: true, AllowReadWriteOncePod: true,
EnableRecoverFromExpansionFailure: false, EnableRecoverFromExpansionFailure: false,
EnableRetroactiveDefaultStorageClass: true,
}, },
}, },
"rwop allowed because used and feature disabled": { "rwop allowed because used and feature disabled": {
oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOncePod}), oldPvc: pvcWithAccessModes([]core.PersistentVolumeAccessMode{core.ReadWriteOncePod}),
enableReadWriteOncePod: false, enableReadWriteOncePod: false,
expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{ expectValidationOpts: PersistentVolumeClaimSpecValidationOptions{
AllowReadWriteOncePod: true, AllowReadWriteOncePod: true,
EnableRecoverFromExpansionFailure: false, EnableRecoverFromExpansionFailure: false,
EnableRetroactiveDefaultStorageClass: true,
}, },
}, },
} }

View File

@ -1003,7 +1003,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha}, RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha},
RetroactiveDefaultStorageClass: {Default: false, PreRelease: featuregate.Alpha}, RetroactiveDefaultStorageClass: {Default: true, PreRelease: featuregate.Beta},
RotateKubeletServerCertificate: {Default: true, PreRelease: featuregate.Beta}, RotateKubeletServerCertificate: {Default: true, PreRelease: featuregate.Beta},

View File

@ -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) { 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 // Temporarily set all default storage classes as non-default