From 4922c5a93402234b482f817269d45236df5154c0 Mon Sep 17 00:00:00 2001
From: "Carvajal, Luis" <luis.carvajal@nuance.com>
Date: Wed, 14 Mar 2018 14:02:26 -0400
Subject: [PATCH 1/2] Remove unnecessary search for the configmap because the
 configmap name that changed is already known in the caller function.

---
 controller/controller.go | 56 +++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/controller/controller.go b/controller/controller.go
index c064cd28..35bfb88c 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -164,7 +164,7 @@ func rollingUpgradeDeployments(cm *api.ConfigMap, c *client.Client) error {
 				}
 			}
 			if matches {
-				updateContainers(containers, annotationValue, configMapVersion)
+				updateContainers(containers, configMapVersion, configMapName)
 
 				// update the deployment
 				_, err := c.Deployments(ns).Update(&d)
@@ -202,7 +202,7 @@ func rollingUpgradeDeploymentsConfigs(cm *api.ConfigMap, oc *oclient.Client) err
 				}
 			}
 			if matches {
-				if updateContainers(containers, annotationValue, configMapVersion) {
+				if updateContainers(containers, configMapVersion, configMapName) {
 					// update the deployment
 					_, err := oc.DeploymentConfigs(ns).Update(&d)
 					if err != nil {
@@ -229,36 +229,32 @@ func convertConfigMapToToken(cm *api.ConfigMap) string {
 	return text
 }
 
-func updateContainers(containers []api.Container, annotationValue, configMapVersion string) bool {
+func updateContainers(containers []api.Container, configMapVersion string, cmNameToUpdate string) bool {
 	// we can have multiple configmaps to update
 	answer := false
-	configmaps := strings.Split(annotationValue, ",")
-	for _, cmNameToUpdate := range configmaps {
-		configmapEnvar := "FABRIC8_" + convertToEnvVarName(cmNameToUpdate) + "_CONFIGMAP"
-
-		for i := range containers {
-			envs := containers[i].Env
-			matched := false
-			for j := range envs {
-				if envs[j].Name == configmapEnvar {
-					matched = true
-					if envs[j].Value != configMapVersion {
-						glog.Infof("Updating %s to %s", configmapEnvar, configMapVersion)
-						envs[j].Value = configMapVersion
-						answer = true
-					}
-				}
-			}
-			// if no existing env var exists lets create one
-			if !matched {
-				e := api.EnvVar{
-					Name:  configmapEnvar,
-					Value: configMapVersion,
-				}
-				containers[i].Env = append(containers[i].Env, e)
-				answer = true
-			}
-		}
+  configmapEnvar := "FABRIC8_" + convertToEnvVarName(cmNameToUpdate) + "_CONFIGMAP"
+  for i := range containers {
+    envs := containers[i].Env
+    matched := false
+    for j := range envs {
+      if envs[j].Name == configmapEnvar {
+        matched = true
+        if envs[j].Value != configMapVersion {
+          glog.Infof("Updating %s to %s", configmapEnvar, configMapVersion)
+          envs[j].Value = configMapVersion
+          answer = true
+        }
+      }
+    }
+    // if no existing env var exists lets create one
+    if !matched {
+      e := api.EnvVar{
+        Name:  configmapEnvar,
+        Value: configMapVersion,
+      }
+      containers[i].Env = append(containers[i].Env, e)
+      answer = true
+    }
 	}
 	return answer
 }

From 5badcb8fd80a884987da1f58f42fcf98b92b9b2b Mon Sep 17 00:00:00 2001
From: "Carvajal, Luis" <luis.carvajal@nuance.com>
Date: Wed, 14 Mar 2018 14:22:38 -0400
Subject: [PATCH 2/2] reformating

---
 controller/controller.go | 46 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/controller/controller.go b/controller/controller.go
index 35bfb88c..8cdb8b3d 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -232,29 +232,29 @@ func convertConfigMapToToken(cm *api.ConfigMap) string {
 func updateContainers(containers []api.Container, configMapVersion string, cmNameToUpdate string) bool {
 	// we can have multiple configmaps to update
 	answer := false
-  configmapEnvar := "FABRIC8_" + convertToEnvVarName(cmNameToUpdate) + "_CONFIGMAP"
-  for i := range containers {
-    envs := containers[i].Env
-    matched := false
-    for j := range envs {
-      if envs[j].Name == configmapEnvar {
-        matched = true
-        if envs[j].Value != configMapVersion {
-          glog.Infof("Updating %s to %s", configmapEnvar, configMapVersion)
-          envs[j].Value = configMapVersion
-          answer = true
-        }
-      }
-    }
-    // if no existing env var exists lets create one
-    if !matched {
-      e := api.EnvVar{
-        Name:  configmapEnvar,
-        Value: configMapVersion,
-      }
-      containers[i].Env = append(containers[i].Env, e)
-      answer = true
-    }
+	configmapEnvar := "FABRIC8_" + convertToEnvVarName(cmNameToUpdate) + "_CONFIGMAP"
+	for i := range containers {
+		envs := containers[i].Env
+		matched := false
+		for j := range envs {
+			if envs[j].Name == configmapEnvar {
+				matched = true
+				if envs[j].Value != configMapVersion {
+					glog.Infof("Updating %s to %s", configmapEnvar, configMapVersion)
+					envs[j].Value = configMapVersion
+					answer = true
+				}
+			}
+		}
+		// if no existing env var exists lets create one
+		if !matched {
+			e := api.EnvVar{
+				Name:  configmapEnvar,
+				Value: configMapVersion,
+			}
+			containers[i].Env = append(containers[i].Env, e)
+			answer = true
+		}
 	}
 	return answer
 }