reverting changes in tekton pipeline + excluding charts from ct

Author: elai-shalev

charts/orchestrator-software-templates-infra/ci/upstream-values.yaml

@@ -12,7 +12,7 @@ openshiftPipelines:
 openshiftGitops:
   name: argocd
   namespaces:
-    - olm
+    - orchestrator-gitops
   subscription:
     namespace: operators
     name: argocd-operator

charts/orchestrator-software-templates-infra/templates/openshift-gitops/namespace.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.openshiftGitops.namespaces }}
 {{- range $index, $ns := .Values.openshiftGitops.namespaces }}
-{{- if ne $ns "openshift-gitops" }}
+{{- if and (ne $ns "openshift-gitops") (ne $ns "olm") }}
 ---
 apiVersion: v1
 kind: Namespace

charts/orchestrator-software-templates/ci/upstream-values.yaml

@@ -0,0 +1,15 @@
+argocd:
+  enabled: true
+  argocdNamespace: orchestrator-gitops
+
+tekton:
+  enabled: true
+
+rhdhConfig:
+  secretRef:
+    name: orchestrator-auth-secret
+    k8s:
+      clusterToken: fake-token-for-testing
+
+orchestratorTemplates:
+  enabled: true

charts/orchestrator-software-templates/templates/_helpers.tpl

@@ -82,23 +82,26 @@
     {{- if $paramValue -}}
         {{- $paramValue -}}
     {{- else -}}
+        {{/* Only validate namespace existence during actual deployment, not during template testing */}}
         {{- $ns:= "" }}
         {{- $list:= lookup "v1" "Namespace" "" "" -}}
-        {{- if eq 0 (len (dig "items" (dict "" "") $list ) )}}
-            {{- fail (printf "No namespaces found: %d" (len (dig "items" (dict "" "") $list))  ) }}
-        {{- end -}}
-        {{- range (dig "items" (dict "" "") $list) }}
-            {{- $labels:= dig "metadata" "labels" (dict "" "" ) .  -}}
-            {{- if (hasKey $labels $matchingLabel ) }}
-                {{- if not $ns }}
-                    {{- $ns = dig "metadata" "name" "" . -}}
-                {{- else -}}
-                    {{- fail (printf "More than one namespace found with label %s: %s and %s" $matchingLabel $ns (dig "metadata" "name" "" .) )}}
-                {{- end }}
+        {{- if $list -}}
+            {{- if eq 0 (len (dig "items" (dict "" "") $list ) )}}
+                {{- fail (printf "No namespaces found: %d" (len (dig "items" (dict "" "") $list))  ) }}
             {{- end -}}
-        {{- end -}}
-        {{- if not $ns -}}
-            {{- fail (printf "No namespace found with label '%s'. Please follow the installation instructions to properly configure the environment" $matchingLabel) -}}
+            {{- range (dig "items" (dict "" "") $list) }}
+                {{- $labels:= dig "metadata" "labels" (dict "" "" ) .  -}}
+                {{- if (hasKey $labels $matchingLabel ) }}
+                    {{- if not $ns }}
+                        {{- $ns = dig "metadata" "name" "" . -}}
+                    {{- else -}}
+                        {{- fail (printf "More than one namespace found with label %s: %s and %s" $matchingLabel $ns (dig "metadata" "name" "" .) )}}
+                    {{- end }}
+                {{- end -}}
+            {{- end -}}
+            {{- if not $ns -}}
+                {{- fail (printf "No namespace found with label '%s'. Please follow the installation instructions to properly configure the environment" $matchingLabel) -}}
+            {{- end }}
         {{- end }}
         {{- $ns }}
     {{- end -}}

…ates/templates/argocd/arocd-project.yaml …tes/templates/argocd/argocd-project.yamlcharts/orchestrator-software-templates/templates/argocd/arocd-project.yaml renamed to charts/orchestrator-software-templates/templates/argocd/argocd-project.yaml charts/orchestrator-software-templates/templates/argocd/arocd-project.yaml renamed to charts/orchestrator-software-templates/templates/argocd/argocd-project.yaml

@@ -3,7 +3,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
   name: orchestrator-gitops
-  namespace: {{ include "get-argocd-namespace" . }}
+  namespace: {{ .Values.argocd.argocdNamespace }}
 spec:
   destinations:
   - name: '*'

charts/orchestrator-software-templates/templates/software-templates/orchestrator-auth.yaml

@@ -2,9 +2,14 @@
 {{- if not .Values.rhdhConfig.secretRef.name }}
   {{- fail "Backstage's secret name defined in 'rhdhConfig.secretRef.name' is required" }}
 {{- end }}
-{{- $secret := lookup "v1" "Secret" .Values.orchestratorTemplates.rhdhChartNamespace .Values.rhdhConfig.secretRef.name }}
-{{- if not $secret }}
-  {{- fail (printf "Secret %s not found in namespace %s" .Values.rhdhConfig.secretRef.name .Values.orchestratorTemplates.rhdhChartNamespace ) }}
+{{/* Only validate secret existence during actual deployment, not during template testing */}}
+{{- $secret := dict }}
+{{- $nsExists := lookup "v1" "Namespace" "" .Values.orchestratorTemplates.rhdhChartNamespace }}
+{{- if $nsExists }}
+  {{- $secret = lookup "v1" "Secret" .Values.orchestratorTemplates.rhdhChartNamespace .Values.rhdhConfig.secretRef.name }}
+  {{- if not $secret }}
+    {{- fail (printf "Secret %s not found in namespace %s" .Values.rhdhConfig.secretRef.name .Values.orchestratorTemplates.rhdhChartNamespace ) }}
+  {{- end }}
 {{- end }}
 
 apiVersion: v1

charts/orchestrator-software-templates/templates/tekton/tekton-tasks.yaml

@@ -1,4 +1,3 @@
-
 # From https://raw.githubusercontent.com/tektoncd/catalog/main/task/git-cli/0.4/git-cli.yaml
 apiVersion: tekton.dev/v1
 kind: Task
@@ -98,22 +97,22 @@ spec:
       image: $(params.BASE_IMAGE)
       workingDir: $(workspaces.source.path)
       env:
-      - name: HOME
-        value: $(params.USER_HOME)
-      - name: PARAM_VERBOSE
-        value: $(params.VERBOSE)
-      - name: PARAM_USER_HOME
-        value: $(params.USER_HOME)
-      - name: WORKSPACE_OUTPUT_PATH
-        value: $(workspaces.output.path)
-      - name: WORKSPACE_SSH_DIRECTORY_BOUND
-        value: $(workspaces.ssh-directory.bound)
-      - name: WORKSPACE_SSH_DIRECTORY_PATH
-        value: $(workspaces.ssh-directory.path)
-      - name: WORKSPACE_BASIC_AUTH_DIRECTORY_BOUND
-        value: $(workspaces.basic-auth.bound)
-      - name: WORKSPACE_BASIC_AUTH_DIRECTORY_PATH
-        value: $(workspaces.basic-auth.path)
+        - name: HOME
+          value: $(params.USER_HOME)
+        - name: PARAM_VERBOSE
+          value: $(params.VERBOSE)
+        - name: PARAM_USER_HOME
+          value: $(params.USER_HOME)
+        - name: WORKSPACE_OUTPUT_PATH
+          value: $(workspaces.output.path)
+        - name: WORKSPACE_SSH_DIRECTORY_BOUND
+          value: $(workspaces.ssh-directory.bound)
+        - name: WORKSPACE_SSH_DIRECTORY_PATH
+          value: $(workspaces.ssh-directory.path)
+        - name: WORKSPACE_BASIC_AUTH_DIRECTORY_BOUND
+          value: $(workspaces.basic-auth.bound)
+        - name: WORKSPACE_BASIC_AUTH_DIRECTORY_PATH
+          value: $(workspaces.basic-auth.path)
       script: |
         #!/usr/bin/env sh
         set -eu

ct-install.yaml

@@ -3,3 +3,8 @@ chart-dirs:
 validate-maintainers: false
 remote: origin
 helm-extra-args: --timeout 500s
+# Excluding software template charts - which are for demo purposes
+excluded-charts:
+  - orchestrator-software-templates
+  - orchestrator-software-templates-infra
+

ct.yaml

@@ -3,3 +3,7 @@ chart-dirs:
 validate-maintainers: false
 remote: origin
 helm-extra-args: --timeout 500s
+# Excluding software template charts - which are for demo purposes
+excluded-charts:
+  - orchestrator-software-templates
+  - orchestrator-software-templates-infra