Merge pull request syndesisio#8927 from phantomjinx/entesb-14410

ENTESB-14410: Stops erroneous OLM subscriptions with no package defined
xoe-labs · Aug 13, 2020 · 2c0ecef · 2c0ecef
2 parents b23c2b8 + 27628b4
commit 2c0ecef
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 9 deletions.
diff --git a/install/operator/pkg/generator/assets/install/operator.yml.tmpl b/install/operator/pkg/generator/assets/install/operator.yml.tmpl
@@ -76,15 +76,12 @@
     name: syndesis-operator
   spec:
     tags:
-    {{if .DevSupport}}
-    - name: "latest"
-      from:
-        name: {{.Image}}:latest
-        kind: ImageStreamTag
-    {{else}}
     - name: "{{.Tag}}"
       from:
         name: {{.Image}}:{{.Tag}}
+    {{if .DevSupport}}
+        kind: ImageStreamTag
+    {{else}}
         kind: DockerImage
       importPolicy:
         scheduled: true

diff --git a/install/operator/pkg/generator/assets_vfsdata.go b/install/operator/pkg/generator/assets_vfsdata.go
diff --git a/install/operator/pkg/syndesis/action/install.go b/install/operator/pkg/syndesis/action/install.go
@@ -216,7 +216,8 @@ func (a *installAction) Execute(ctx context.Context, syndesis *v1beta1.Syndesis)
 
 		a.log.Info("Installing addon", "Name", addonInfo.Name())
 
-		if config.ApiServer.OlmSupport && addonInfo.GetOlmSpec() != nil {
+		if config.ApiServer.OlmSupport && addonInfo.GetOlmSpec() != nil && addonInfo.GetOlmSpec().Package != "" {
+			a.log.Info("Subscribing to OLM operator:", "Package", addonInfo.GetOlmSpec().Package, "Channel", addonInfo.GetOlmSpec().Channel)
 			//
 			// Using the operator hub is not mutally exclusive to loading the addon
 			// resources. Each addon should be tailored with conditionals to be