Skip to content

Commit a3ae29b

Browse files
committed
fix(setting): do not delete the storage class
Do not delete the old storage class set in the `default-longhorn-static-storage-class` setting. Leave it available for users. ref: longhorn/longhorn 9391 Signed-off-by: James Lu <[email protected]>
1 parent 1cd29fd commit a3ae29b

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

controller/setting_controller.go

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func NewSettingController(
139139
var err error
140140
if _, err = ds.SettingInformer.AddEventHandlerWithResyncPeriod(cache.ResourceEventHandlerFuncs{
141141
AddFunc: sc.enqueueSetting,
142-
UpdateFunc: func(old, cur interface{}) { sc.enqueueUpdateSetting(old, cur) },
142+
UpdateFunc: func(old, cur interface{}) { sc.enqueueSetting(cur) },
143143
DeleteFunc: sc.enqueueSetting,
144144
}, settingControllerResyncPeriod); err != nil {
145145
return nil, err
@@ -1444,31 +1444,6 @@ func (sc *SettingController) enqueueSetting(obj interface{}) {
14441444
sc.queue.Add(key)
14451445
}
14461446

1447-
func (sc *SettingController) enqueueUpdateSetting(oldObj, newObj interface{}) {
1448-
key, err := controller.KeyFunc(newObj)
1449-
if err != nil {
1450-
utilruntime.HandleError(fmt.Errorf("failed to get key for object %#v: %v", newObj, err))
1451-
return
1452-
}
1453-
1454-
oldSetting := oldObj.(*longhorn.Setting)
1455-
if oldSetting.Name == string(types.SettingNameDefaultLonghornStaticStorageClass) {
1456-
_, err := sc.ds.GetStorageClassRO(oldSetting.Value)
1457-
if err == nil {
1458-
if err := sc.ds.DeleteStorageClass(oldSetting.Value); err != nil {
1459-
utilruntime.HandleError(fmt.Errorf("failed to delete old %v for object %#v: %v", types.SettingNameDefaultLonghornStaticStorageClass, oldObj, err))
1460-
return
1461-
}
1462-
}
1463-
if err != nil && !apierrors.IsNotFound(err) {
1464-
utilruntime.HandleError(fmt.Errorf("failed to get old %v for object %#v: %v", types.SettingNameDefaultLonghornStaticStorageClass, oldObj, err))
1465-
return
1466-
}
1467-
}
1468-
1469-
sc.queue.Add(key)
1470-
}
1471-
14721447
func (sc *SettingController) enqueueSettingForNode(obj interface{}) {
14731448
if _, ok := obj.(*longhorn.Node); !ok {
14741449
// Ignore deleted node

0 commit comments

Comments
 (0)