diff --git a/controller/setting_controller.go b/controller/setting_controller.go index 2b0c95c950..a68c8db523 100644 --- a/controller/setting_controller.go +++ b/controller/setting_controller.go @@ -763,6 +763,8 @@ func (sc *SettingController) updateCNI() error { } nadAnnot := string(types.CNIAnnotationNetworks) + nadAnnotValue := types.CreateCniAnnotationFromSetting(storageNetwork) + imPodList, err := sc.ds.ListInstanceManagerPods() if err != nil { return errors.Wrapf(err, "failed to list instance manager Pods for %v setting update", types.SettingNameStorageNetwork) @@ -775,10 +777,16 @@ func (sc *SettingController) updateCNI() error { pods := append(imPodList, bimPodList...) for _, pod := range pods { - if pod.Annotations[nadAnnot] == storageNetwork.Value { + if pod.Annotations[nadAnnot] == nadAnnotValue { continue } + logrus.WithFields(logrus.Fields{ + "pod": pod.Name, + "oldValue": pod.Annotations[nadAnnot], + "newValue": nadAnnotValue, + }).Infof("Deleting pod to update the %v annotation", nadAnnot) + if err := sc.ds.DeletePod(pod.Name); err != nil { return err }