@@ -139,7 +139,7 @@ func NewSettingController(
139
139
var err error
140
140
if _ , err = ds .SettingInformer .AddEventHandlerWithResyncPeriod (cache.ResourceEventHandlerFuncs {
141
141
AddFunc : sc .enqueueSetting ,
142
- UpdateFunc : func (old , cur interface {}) { sc .enqueueUpdateSetting ( old , cur ) },
142
+ UpdateFunc : func (old , cur interface {}) { sc .enqueueSetting ( cur ) },
143
143
DeleteFunc : sc .enqueueSetting ,
144
144
}, settingControllerResyncPeriod ); err != nil {
145
145
return nil , err
@@ -1444,31 +1444,6 @@ func (sc *SettingController) enqueueSetting(obj interface{}) {
1444
1444
sc .queue .Add (key )
1445
1445
}
1446
1446
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
-
1472
1447
func (sc * SettingController ) enqueueSettingForNode (obj interface {}) {
1473
1448
if _ , ok := obj .(* longhorn.Node ); ! ok {
1474
1449
// Ignore deleted node
0 commit comments