DevFW-CICD/argocd-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-workflows): Fix templating in several places (#2026)

Browse source 
* Add artifacthub changes

Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>

* fix templating list of yamls

Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>

* Bump version and fix templating for gcs and azure as well

Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>

---------

Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>
Co-authored-by: Aikawa <yu.croco@gmail.com>
This commit is contained in:
PidgeyBE 2023-05-11 02:09:33 +02:00 committed by GitHub
parent b37a9e72a6
commit f6d44750b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-workflows/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v3.4.7
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.26.5 version: 0.26.6
icon: https://argoproj.github.io/argo-workflows/assets/logo.png icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
sources: sources:
@ -16,5 +16,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added - kind: fixed
description: Introduce chart signing description: Fix Helm templating in S3 config and extra init containers

18
charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
View file

@ -60,29 +60,29 @@ data:
archiveLogs: {{ .Values.artifactRepository.archiveLogs }} archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
{{- end }} {{- end }}
{{- with .Values.artifactRepository.gcs }} {{- with .Values.artifactRepository.gcs }}
gcs: {{- toYaml . | nindent 8 }} gcs: {{- tpl (toYaml .) $ | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.artifactRepository.azure }} {{- with .Values.artifactRepository.azure }}
azure: {{- toYaml . | nindent 8 }} azure: {{- tpl (toYaml .) $ | nindent 8 }}
{{- end }} {{- end }}
{{- if and (not .Values.artifactRepository.gcs) (not .Values.artifactRepository.azure) }} {{- if and (not .Values.artifactRepository.gcs) (not .Values.artifactRepository.azure) }}
s3: s3:
{{- if .Values.useStaticCredentials }} {{- if .Values.useStaticCredentials }}
accessKeySecret: accessKeySecret:
key: {{ .Values.artifactRepository.s3.accessKeySecret.key }} key: {{ tpl .Values.artifactRepository.s3.accessKeySecret.key . }}
name: {{ .Values.artifactRepository.s3.accessKeySecret.name }} name: {{ tpl .Values.artifactRepository.s3.accessKeySecret.name . }}
secretKeySecret: secretKeySecret:
key: {{ .Values.artifactRepository.s3.secretKeySecret.key }} key: {{ tpl .Values.artifactRepository.s3.secretKeySecret.key . }}
name: {{ .Values.artifactRepository.s3.secretKeySecret.name }} name: {{ tpl .Values.artifactRepository.s3.secretKeySecret.name . }}
{{- end }} {{- end }}
bucket: {{ .Values.artifactRepository.s3.bucket }} bucket: {{ tpl (.Values.artifactRepository.s3.bucket | default "") . }}
endpoint: {{ .Values.artifactRepository.s3.endpoint }} endpoint: {{ tpl (.Values.artifactRepository.s3.endpoint | default "") . }}
insecure: {{ .Values.artifactRepository.s3.insecure }} insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- if .Values.artifactRepository.s3.keyFormat }} {{- if .Values.artifactRepository.s3.keyFormat }}
keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }} keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }}
{{- end }} {{- end }}
{{- if .Values.artifactRepository.s3.region }} {{- if .Values.artifactRepository.s3.region }}
region: {{ .Values.artifactRepository.s3.region }} region: {{ tpl .Values.artifactRepository.s3.region $ }}
{{- end }} {{- end }}
{{- if .Values.artifactRepository.s3.roleARN }} {{- if .Values.artifactRepository.s3.roleARN }}
roleARN: {{ .Values.artifactRepository.s3.roleARN }} roleARN: {{ .Values.artifactRepository.s3.roleARN }}

2
charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
View file

@ -35,7 +35,7 @@ spec:
{{- end }} {{- end }}
{{- with .Values.controller.extraInitContainers }} {{- with .Values.controller.extraInitContainers }}
initContainers: initContainers:
{{- toYaml . | nindent 8 }} {{- tpl (toYaml .) $ | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: controller - name: controller

2
charts/argo-workflows/templates/server/server-deployment.yaml
View file

@ -38,7 +38,7 @@ spec:
{{- end }} {{- end }}
{{- with .Values.server.extraInitContainers }} {{- with .Values.server.extraInitContainers }}
initContainers: initContainers:
{{- toYaml . | nindent 8 }} {{- tpl (toYaml .) $ | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: argo-server - name: argo-server

4
charts/argo-workflows/values.yaml
View file

@ -655,10 +655,10 @@ artifactRepository:
# Note the `key` attribute is not the actual secret, it's the PATH to # Note the `key` attribute is not the actual secret, it's the PATH to
# the contents in the associated secret, as defined by the `name` attribute. # the contents in the associated secret, as defined by the `name` attribute.
accessKeySecret: accessKeySecret:
# name: <releaseName>-minio name: "{{ .Release.Name }}-minio"
key: accesskey key: accesskey
secretKeySecret: secretKeySecret:
# name: <releaseName>-minio name: "{{ .Release.Name }}-minio"
key: secretkey key: secretkey
# insecure will disable TLS. Primarily used for minio installs not configured with TLS # insecure will disable TLS. Primarily used for minio installs not configured with TLS
insecure: false insecure: false