Fix components guards (#64)

* Fix guards on subscriptions leading to them being deleted on updates. * Add guard for DH.
redhat-appstudio · Mar 21, 2024 · 1b2c468 · 1b2c468
1 parent 9201850
commit 1b2c468
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/templates/developer-hub/includes/_configure.tpl b/templates/developer-hub/includes/_configure.tpl
@@ -1,4 +1,5 @@
 {{ define "rhtap.developer-hub.configure" }}
+{{ if (index .Values "developer-hub") }}
 - name: configure-developer-hub
   image: "quay.io/codeready-toolchain/oc-client-base:latest"
   command:
@@ -142,4 +143,5 @@
 
       echo
       echo "Configuration successful"
+{{ end }}
 {{ end }}
diff --git a/templates/openshift-gitops/subscription.yaml b/templates/openshift-gitops/subscription.yaml
@@ -1,5 +1,5 @@
 ---
-{{if eq (len (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "applications.argoproj.io")) 0}}
+{{ if (index .Values "openshift-gitops") }}
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:

diff --git a/templates/openshift-pipelines/subscription.yaml b/templates/openshift-pipelines/subscription.yaml
@@ -1,5 +1,5 @@
 ---
-{{if eq (len (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "pipelines.tekton.dev")) 0}}
+{{ if (index .Values "openshift-pipelines") }}
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:

diff --git a/test/data/helm-chart/template.yaml b/test/data/helm-chart/template.yaml
@@ -141,6 +141,7 @@ spec:
               echo "Configuration successful"
 
 
+
         - name: configure-developer-hub
           image: "quay.io/codeready-toolchain/oc-client-base:latest"
           command:
@@ -503,6 +504,7 @@ spec:
               echo
               echo "Configuration successful"
 
+
 
         - name: configure-gitops
           image: "quay.io/codeready-toolchain/oc-client-base:latest"