Skip to content

Commit cc6de8e

Browse files
authored
Merge pull request #116 from Roming22/fix/tekton-config
fix(pipelines): prefer TAS service URLs in TektonConfig chain patch
2 parents ef1f0f6 + 67a4efe commit cc6de8e

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

  • installer/charts/tsf-pipelines/templates/tektonconfig

installer/charts/tsf-pipelines/templates/tektonconfig/patch._tpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{{- define "pipelines.TektonConfigPatch" -}}
22
{{- $tasSecretObj := (lookup "v1" "Secret" .Values.pipelines.tsf.namespace "tsf-tas-integration") | default dict -}}
33
{{- $secretData := required (printf "Secret 'tsf-tas-integration' not found in namespace '%s'" .Values.pipelines.tsf.namespace) (get $tasSecretObj "data") | default dict -}}
4-
{{- $fulcio_url := required (printf "fulcio_url not found in secret 'tsf-tas-integration' in namespace '%s'" .Values.pipelines.tsf.namespace) (get $secretData "fulcio_url") | b64dec | toString -}}
5-
{{- $rekor_url := required (printf "rekor_url not found in secret 'tsf-tas-integration' in namespace '%s'" .Values.pipelines.tsf.namespace) (get $secretData "rekor_url") | b64dec | toString -}}
4+
{{- $fulcio_raw := (get $secretData "fulcio_service_url") | default (get $secretData "fulcio_url") -}}
5+
{{- $fulcio_url := required (printf "Neither fulcio_service_url nor fulcio_url found in secret 'tsf-tas-integration' in namespace '%s'" .Values.pipelines.tsf.namespace) $fulcio_raw | b64dec | toString -}}
6+
{{- $rekor_raw := (get $secretData "rekor_service_url") | default (get $secretData "rekor_url") -}}
7+
{{- $rekor_url := required (printf "Neither rekor_service_url nor rekor_url found in secret 'tsf-tas-integration' in namespace '%s'" .Values.pipelines.tsf.namespace) $rekor_raw | b64dec | toString -}}
68
metadata:
79
annotations:
810
meta.helm.sh/release-name: {{ .Chart.Name }}

0 commit comments

Comments
 (0)