operator: fix controllers indicating changes when there are none

Signed-off-by: Tuomas Katila <[email protected]>

Author: tkatila

pkg/controllers/dlb/controller.go

@@ -118,8 +118,11 @@ func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (
 			updated = true
 		}
 	} else {
-		setInitContainer(&ds.Spec.Template.Spec, dp.Spec)
-		updated = true
+		containers := ds.Spec.Template.Spec.InitContainers
+		if len(containers) != 1 || containers[0].Image != dp.Spec.InitImage {
+			setInitContainer(&ds.Spec.Template.Spec, dp.Spec)
+			updated = true
+		}
 	}
 
 	if len(dp.Spec.NodeSelector) > 0 {

pkg/controllers/dsa/controller.go

@@ -218,9 +218,12 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin)
 	found := false
 
 	for _, container := range ds.Spec.Template.Spec.InitContainers {
-		if container.Name == inicontainerName && container.Image != dp.Spec.InitImage {
+		if container.Name == inicontainerName {
+			if container.Image != dp.Spec.InitImage {
+				update = true
+			}
+
 			found = true
-			update = true
 
 			break
 		}

pkg/controllers/gpu/controller.go

@@ -242,32 +242,54 @@ func removeVolumeMount(volumeMounts []v1.VolumeMount, name string) []v1.VolumeMo
 	return newVolumeMounts
 }
 
-func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (updated bool) {
-	dp := rawObj.(*devicepluginv1.GpuDevicePlugin)
-
-	if ds.Spec.Template.Spec.Containers[0].Image != dp.Spec.Image {
-		ds.Spec.Template.Spec.Containers[0].Image = dp.Spec.Image
-		updated = true
-	}
+func processInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.GpuDevicePlugin) bool {
+	initContainers := ds.Spec.Template.Spec.InitContainers
 
 	if dp.Spec.InitImage == "" {
-		if ds.Spec.Template.Spec.InitContainers != nil {
+		if initContainers != nil {
 			ds.Spec.Template.Spec.InitContainers = nil
 			ds.Spec.Template.Spec.Volumes = removeVolume(ds.Spec.Template.Spec.Volumes, "nfd-features")
-			updated = true
+
+			return true
 		}
-	} else {
+	} else if len(initContainers) != 1 || initContainers[0].Image != dp.Spec.InitImage {
 		setInitContainer(&ds.Spec.Template.Spec, dp.Spec.InitImage)
-		updated = true
+
+		return true
 	}
 
+	return false
+}
+
+func processNodeSelector(ds *apps.DaemonSet, dp *devicepluginv1.GpuDevicePlugin) bool {
 	if len(dp.Spec.NodeSelector) > 0 {
 		if !reflect.DeepEqual(ds.Spec.Template.Spec.NodeSelector, dp.Spec.NodeSelector) {
 			ds.Spec.Template.Spec.NodeSelector = dp.Spec.NodeSelector
-			updated = true
+
+			return true
 		}
 	} else if !reflect.DeepEqual(ds.Spec.Template.Spec.NodeSelector, defaultNodeSelector) {
 		ds.Spec.Template.Spec.NodeSelector = defaultNodeSelector
+
+		return true
+	}
+
+	return false
+}
+
+func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (updated bool) {
+	dp := rawObj.(*devicepluginv1.GpuDevicePlugin)
+
+	if ds.Spec.Template.Spec.Containers[0].Image != dp.Spec.Image {
+		ds.Spec.Template.Spec.Containers[0].Image = dp.Spec.Image
+		updated = true
+	}
+
+	if processInitContainer(ds, dp) {
+		updated = true
+	}
+
+	if processNodeSelector(ds, dp) {
 		updated = true
 	}
 

pkg/controllers/iaa/controller.go

@@ -219,9 +219,12 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin)
 	found := false
 
 	for _, container := range ds.Spec.Template.Spec.InitContainers {
-		if container.Name == "intel-iaa-initcontainer" && container.Image != dp.Spec.InitImage {
+		if container.Name == "intel-iaa-initcontainer" {
+			if container.Image != dp.Spec.InitImage {
+				update = true
+			}
+
 			found = true
-			update = true
 
 			break
 		}

pkg/controllers/qat/controller.go

@@ -111,7 +111,12 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
 func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (updated bool) {
 	dp := rawObj.(*devicepluginv1.QatDevicePlugin)
 
-	if !reflect.DeepEqual(ds.ObjectMeta.Annotations, dp.ObjectMeta.Annotations) {
+	// Remove always incrementing annotation so it doesn't cause the next DeepEqual
+	// to return false every time.
+	dsAnnotations := ds.ObjectMeta.DeepCopy().Annotations
+	delete(dsAnnotations, "deprecated.daemonset.template.generation")
+
+	if !reflect.DeepEqual(dsAnnotations, dp.ObjectMeta.Annotations) {
 		pluginAnnotations := dp.ObjectMeta.DeepCopy().Annotations
 		ds.ObjectMeta.Annotations = pluginAnnotations
 		ds.Spec.Template.Annotations = pluginAnnotations
@@ -131,8 +136,12 @@ func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (
 			updated = true
 		}
 	} else {
-		setInitContainer(&ds.Spec.Template.Spec, dp.Spec)
-		updated = true
+		containers := ds.Spec.Template.Spec.InitContainers
+		if len(containers) != 1 || containers[0].Image != dp.Spec.InitImage {
+			setInitContainer(&ds.Spec.Template.Spec, dp.Spec)
+
+			updated = true
+		}
 	}
 
 	if len(dp.Spec.NodeSelector) > 0 {