github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove RetroactiveDefaultStorageClass feature gate checks

Browse Source
This commit is contained in:
Roman Bednar
2023-06-07 14:27:49 +02:00
parent 6afb363ca1
commit ac15d69757
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,18 +353,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 {