From e2fcf1bf81ebc583071321e23fa5e480ddaec21f Mon Sep 17 00:00:00 2001 From: Romain Arnaud Date: Thu, 19 Mar 2026 12:38:23 -0400 Subject: [PATCH] fix: allow a deployment without Pipelines cf RHTAP-6460 Since another CI system may be used, Pipelines is optional. - Modified values.yaml.tpl and values.yaml to enable pipelines configurations. - Updated patch-serviceaccounts.yaml run based on the new configuration. - Modified extra-env.yaml to always include GITHUB__HOST. --- .../templates/serviceaccounts/patch-serviceaccounts.yaml | 2 ++ installer/charts/tssc-app-namespaces/values.yaml | 4 +++- installer/charts/tssc-dh/templates/extra-env.yaml | 2 +- installer/values.yaml.tpl | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/installer/charts/tssc-app-namespaces/templates/serviceaccounts/patch-serviceaccounts.yaml b/installer/charts/tssc-app-namespaces/templates/serviceaccounts/patch-serviceaccounts.yaml index ba8cabae7..23eaa67fd 100644 --- a/installer/charts/tssc-app-namespaces/templates/serviceaccounts/patch-serviceaccounts.yaml +++ b/installer/charts/tssc-app-namespaces/templates/serviceaccounts/patch-serviceaccounts.yaml @@ -1,3 +1,4 @@ +{{- if .Values.appNamespaces.pipelines.enabled }} {{- $name := .Release.Name }} {{- $context := . }} {{- range .Values.appNamespaces.namespace_prefixes }} @@ -48,3 +49,4 @@ spec: emptyDir: {} {{- end }} {{- end }} +{{- end }} diff --git a/installer/charts/tssc-app-namespaces/values.yaml b/installer/charts/tssc-app-namespaces/values.yaml index cd4ead178..8162b5642 100644 --- a/installer/charts/tssc-app-namespaces/values.yaml +++ b/installer/charts/tssc-app-namespaces/values.yaml @@ -2,4 +2,6 @@ appNamespaces: argoCD: name: __OVERWRITE_ME__ - namespace_prefixes: __OVERWRITE_ME__ \ No newline at end of file + namespace_prefixes: __OVERWRITE_ME__ + pipelines: + enabled: __OVERWRITE_ME__ \ No newline at end of file diff --git a/installer/charts/tssc-dh/templates/extra-env.yaml b/installer/charts/tssc-dh/templates/extra-env.yaml index c294703cc..9c94608fd 100644 --- a/installer/charts/tssc-dh/templates/extra-env.yaml +++ b/installer/charts/tssc-dh/templates/extra-env.yaml @@ -71,11 +71,11 @@ data: GITHUB__APP__CLIENT__SECRET: {{ $ghSecretData.clientSecret }} GITHUB__APP__PRIVATE_KEY: {{ $ghSecretData.pem }} GITHUB__APP__WEBHOOK__SECRET: {{ $ghSecretData.webhookSecret }} + GITHUB__HOST: {{ $ghSecretData.host }} GITHUB__URL: {{ print "https://" ($ghSecretData.host | b64dec) | b64enc }} {{- $pacRoute := (lookup "route.openshift.io/v1" "Route" "openshift-pipelines" "pipelines-as-code-controller") }} {{- if $pacRoute }} GITHUB__APP__WEBHOOK__URL: {{ print "https://" $pacRoute.spec.host | b64enc }} - GITHUB__HOST: {{ $ghSecretData.host }} {{- end }} {{- if .Values.developerHub.RBAC.enabled }} GITHUB__ORG: {{ $ghSecretData.ownerLogin }} diff --git a/installer/values.yaml.tpl b/installer/values.yaml.tpl index 70e61f629..da2533ddd 100644 --- a/installer/values.yaml.tpl +++ b/installer/values.yaml.tpl @@ -207,6 +207,8 @@ appNamespaces: {{- range ($rhdh.Properties.namespacePrefixes | default (tuple (printf "%s-app" .Installer.Namespace))) }} - {{ . }} {{- end }} + pipelines: + enabled: {{ $pipelines.Enabled}} # # tssc-gitops