mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #113329 from RomanBednar/retro-sc-beta
graduate RetroactiveDefaultStorageClass to beta
This commit is contained in:
commit
06ba383532
@ -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,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
@ -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},
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user