Merge pull request #98 from BuddhiWathsala/master

Fix local imagePullSecret skip issue
siddhi-io · Oct 4, 2019 · 1c7d3d4 · 1c7d3d4
2 parents 6659415 + 150325f
commit 1c7d3d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -9,6 +9,7 @@ data:
   siddhiProfile: runner
   siddhiImage: siddhiio/siddhi-runner-alpine:5.1.0-beta
   autoIngressCreation: "true"
+  # siddhiImageSecret: siddhiio
   # ingressTLS: siddhi-tls
 ---
 

diff --git a/pkg/controller/siddhiprocess/siddhicontroller/siddhicontroller.go b/pkg/controller/siddhiprocess/siddhicontroller/siddhicontroller.go
@@ -330,16 +330,10 @@ func (sc *SiddhiController) UpdateDefaultConfigs() {
 
 		if configMap.Data["siddhiImage"] != "" {
 			sc.Image.Name = configMap.Data["siddhiImage"]
-			if sc.SiddhiProcess.Spec.Container.Image != "" {
-				sc.Image.Name = sc.SiddhiProcess.Spec.Container.Image
-			}
 		}
 
 		if configMap.Data["siddhiImageSecret"] != "" {
 			sc.Image.Secret = configMap.Data["siddhiImageSecret"]
-			if sc.SiddhiProcess.Spec.ImagePullSecret != "" {
-				sc.Image.Secret = sc.SiddhiProcess.Spec.ImagePullSecret
-			}
 		}
 
 		if configMap.Data["siddhiProfile"] != "" {
@@ -357,4 +351,10 @@ func (sc *SiddhiController) UpdateDefaultConfigs() {
 		}
 
 	}
+	if sc.SiddhiProcess.Spec.Container.Image != "" {
+		sc.Image.Name = sc.SiddhiProcess.Spec.Container.Image
+	}
+	if sc.SiddhiProcess.Spec.ImagePullSecret != "" {
+		sc.Image.Secret = sc.SiddhiProcess.Spec.ImagePullSecret
+	}
 }