scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118102 from RomanBednar/retro-sc-assignment-ga

Browse Source 
graduate RetroactiveDefaultStorageClass feature to GA in 1.28
This commit is contained in:
Kubernetes Prow Robot
2023-06-27 20:46:32 -07:00
committed by GitHub
parent 470889278f ac15d69757
commit 960830bc66
6 changed files with 55 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/controller/volume/persistentvolume/pv_controller.go
View File

@@ -349,18 +349,16 @@ func (ctrl *PersistentVolumeController) syncUnboundClaim(ctx context.Context, cl
// No PV could be found
// OBSERVATION: pvc is "Pending", will retry
if utilfeature.DefaultFeatureGate.Enabled(features.RetroactiveDefaultStorageClass) {
logger.V(4).Info("FeatureGate is enabled, attempting to assign storage class to unbound PersistentVolumeClaim", "featureGate", features.RetroactiveDefaultStorageClass, "PVC", klog.KObj(claim))
updated, err := ctrl.assignDefaultStorageClass(ctx, claim)
if err != nil {
metrics.RecordRetroactiveStorageClassMetric(false)
return fmt.Errorf("can't update PersistentVolumeClaim[%q]: %w", claimToClaimKey(claim), err)
}
if updated {
logger.V(4).Info("PersistentVolumeClaim update successful, restarting claim sync", "PVC", klog.KObj(claim))
metrics.RecordRetroactiveStorageClassMetric(true)
return nil
}
logger.V(4).Info("Attempting to assign storage class to unbound PersistentVolumeClaim", "PVC", klog.KObj(claim))
updated, err := ctrl.assignDefaultStorageClass(ctx, claim)
if err != nil {
metrics.RecordRetroactiveStorageClassMetric(false)
return fmt.Errorf("can't update PersistentVolumeClaim[%q]: %w", claimToClaimKey(claim), err)
}
if updated {
logger.V(4).Info("PersistentVolumeClaim update successful, restarting claim sync", "PVC", klog.KObj(claim))
metrics.RecordRetroactiveStorageClassMetric(true)
return nil
}
switch {

2
pkg/controller/volume/persistentvolume/pv_controller_test.go
View File

@@ -754,8 +754,6 @@ func TestModifyDeletionFinalizers(t *testing.T) {
}
func TestRetroactiveStorageClassAssignment(t *testing.T) {
// Enable RetroactiveDefaultStorageClass feature gate.
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RetroactiveDefaultStorageClass, true)()
tests := []struct {
storageClasses []*storagev1.StorageClass
tests []controllerTest