Bug 2011976: operator should handle rm nodeSelector (#2730)

nodeSelectors and tolerations on the infrastructure-operator's operands
should always match those of the operator itself. This change makes it
so the operator will always make the operands match the operator's
current running configuration.

Author: djzager

internal/controller/controllers/agentserviceconfig_controller.go

@@ -818,14 +818,15 @@ func (r *AgentServiceConfigReconciler) newImageServiceDeployment(ctx context.Con
 		deployment.Spec.Template.Spec.ServiceAccountName = imageServiceName
 
 		if r.NodeSelector != nil {
-			nodeSelector := make(map[string]string)
-			for key, value := range r.NodeSelector {
-				nodeSelector[key] = value
-			}
-			deployment.Spec.Template.Spec.NodeSelector = nodeSelector
+			deployment.Spec.Template.Spec.NodeSelector = r.NodeSelector
+		} else {
+			deployment.Spec.Template.Spec.NodeSelector = map[string]string{}
 		}
+
 		if r.Tolerations != nil {
-			deployment.Spec.Template.Spec.Tolerations = append([]corev1.Toleration{}, r.Tolerations...)
+			deployment.Spec.Template.Spec.Tolerations = r.Tolerations
+		} else {
+			deployment.Spec.Template.Spec.Tolerations = []corev1.Toleration{}
 		}
 		return nil
 	}
@@ -1111,14 +1112,15 @@ func (r *AgentServiceConfigReconciler) newAssistedServiceDeployment(ctx context.
 		deployment.Spec.Template.Spec.ServiceAccountName = serviceAccountName
 
 		if r.NodeSelector != nil {
-			nodeSelector := make(map[string]string)
-			for key, value := range r.NodeSelector {
-				nodeSelector[key] = value
-			}
-			deployment.Spec.Template.Spec.NodeSelector = nodeSelector
+			deployment.Spec.Template.Spec.NodeSelector = r.NodeSelector
+		} else {
+			deployment.Spec.Template.Spec.NodeSelector = map[string]string{}
 		}
+
 		if r.Tolerations != nil {
-			deployment.Spec.Template.Spec.Tolerations = append([]corev1.Toleration{}, r.Tolerations...)
+			deployment.Spec.Template.Spec.Tolerations = r.Tolerations
+		} else {
+			deployment.Spec.Template.Spec.Tolerations = []corev1.Toleration{}
 		}
 
 		return nil