From 849bd7d80455672bec2e64768c461510fdfb96ad Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Fri, 4 Dec 2020 08:58:22 -0500
Subject: [PATCH] [CARRY] Remove RELATED_IMAGE_ from the handler image env var

This is causing a conflict with ART tooling.
---
 .../kubernetes-nmstate-operator.clusterserviceversion.yaml    | 2 +-
 controllers/nmstate_controller.go                             | 4 ++--
 controllers/nmstate_controller_test.go                        | 2 +-
 deploy/operator/operator.yaml                                 | 2 +-
 ...ernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml b/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml
index 3cf25d072..5517a6438 100644
--- a/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml
@@ -122,7 +122,7 @@ spec:
                 - name: PROFILER_PORT
                   value: "6060"
                 - name: RUN_OPERATOR
-                - name: RELATED_IMAGE_HANDLER_IMAGE
+                - name: HANDLER_IMAGE
                   value: quay.io/nmstate/kubernetes-nmstate-handler:latest
                 - name: HANDLER_IMAGE_PULL_POLICY
                   value: Always
diff --git a/controllers/nmstate_controller.go b/controllers/nmstate_controller.go
index 96a26c2e7..75e2b0f69 100644
--- a/controllers/nmstate_controller.go
+++ b/controllers/nmstate_controller.go
@@ -132,7 +132,7 @@ func (r *NMStateReconciler) applyNamespace(instance *nmstatev1beta1.NMState) err
 func (r *NMStateReconciler) applyRBAC(instance *nmstatev1beta1.NMState) error {
 	data := render.MakeRenderData()
 	data.Data["HandlerNamespace"] = os.Getenv("HANDLER_NAMESPACE")
-	data.Data["HandlerImage"] = os.Getenv("RELATED_IMAGE_HANDLER_IMAGE")
+	data.Data["HandlerImage"] = os.Getenv("HANDLER_IMAGE")
 	data.Data["HandlerPullPolicy"] = os.Getenv("HANDLER_IMAGE_PULL_POLICY")
 	data.Data["HandlerPrefix"] = os.Getenv("HANDLER_PREFIX")
 	return r.renderAndApply(instance, data, "rbac", true)
@@ -159,7 +159,7 @@ func (r *NMStateReconciler) applyHandler(instance *nmstatev1beta1.NMState) error
 	amd64AndCRNodeSelector["beta.kubernetes.io/arch"] = "amd64"
 
 	data.Data["HandlerNamespace"] = os.Getenv("HANDLER_NAMESPACE")
-	data.Data["HandlerImage"] = os.Getenv("RELATED_IMAGE_HANDLER_IMAGE")
+	data.Data["HandlerImage"] = os.Getenv("HANDLER_IMAGE")
 	data.Data["HandlerPullPolicy"] = os.Getenv("HANDLER_IMAGE_PULL_POLICY")
 	data.Data["HandlerPrefix"] = os.Getenv("HANDLER_PREFIX")
 	data.Data["WebhookNodeSelector"] = amd64ArchOnMasterNodeSelector
diff --git a/controllers/nmstate_controller_test.go b/controllers/nmstate_controller_test.go
index b08792cf7..249f802e1 100644
--- a/controllers/nmstate_controller_test.go
+++ b/controllers/nmstate_controller_test.go
@@ -62,7 +62,7 @@ var _ = Describe("NMState controller reconcile", func() {
 		reconciler.Scheme = s
 		reconciler.Log = ctrl.Log.WithName("controllers").WithName("NMState")
 		os.Setenv("HANDLER_NAMESPACE", handlerNamespace)
-		os.Setenv("RELATED_IMAGE_HANDLER_IMAGE", handlerImage)
+		os.Setenv("HANDLER_IMAGE", handlerImage)
 		os.Setenv("HANDLER_IMAGE_PULL_POLICY", imagePullPolicy)
 		os.Setenv("HANDLER_PREFIX", handlerPrefix)
 	})
diff --git a/deploy/operator/operator.yaml b/deploy/operator/operator.yaml
index ecc006d2a..5268447c0 100644
--- a/deploy/operator/operator.yaml
+++ b/deploy/operator/operator.yaml
@@ -44,7 +44,7 @@ spec:
               value: "6060"
             - name: RUN_OPERATOR
               value: ""
-            - name: RELATED_IMAGE_HANDLER_IMAGE
+            - name: HANDLER_IMAGE
               value: {{ .HandlerImage }}
             - name: HANDLER_IMAGE_PULL_POLICY
               value: {{ .HandlerPullPolicy }}
diff --git a/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml b/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml
index 527349950..2ed048e52 100644
--- a/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml
+++ b/manifests/4.7/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml
@@ -128,7 +128,7 @@ spec:
                 - name: PROFILER_PORT
                   value: "6060"
                 - name: RUN_OPERATOR
-                - name: RELATED_IMAGE_HANDLER_IMAGE
+                - name: HANDLER_IMAGE
                   value: quay.io/openshift/origin-kubernetes-nmstate-handler:4.7
                 - name: HANDLER_IMAGE_PULL_POLICY
                   value: Always