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

Add artifacthub changes

Browse source 
Signed-off-by: Peejai <pieterjan.soetaert@robovision.eu>
This commit is contained in:
Peejai 2023-05-09 10:19:13 +02:00
parent c8b47cf060
commit c9acaed4f3
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,4 +14,4 @@ maintainers:
annotations:
artifacthub.io/changes: |
- kind: fixed
description: Fix Helm chart to correctly reference Kubernetes version in conditional check for HPA apiVersion
description: Fix Helm templating in S3 config and extra init containers

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

@ -69,20 +69,20 @@ data:
s3:
{{- if .Values.useStaticCredentials }}
accessKeySecret:
key: {{ .Values.artifactRepository.s3.accessKeySecret.key }}
name: {{ .Values.artifactRepository.s3.accessKeySecret.name }}
key: {{ tpl .Values.artifactRepository.s3.accessKeySecret.key . }}
name: {{ tpl .Values.artifactRepository.s3.accessKeySecret.name . }}
secretKeySecret:
key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
name: {{ .Values.artifactRepository.s3.secretKeySecret.name }}
key: {{ tpl .Values.artifactRepository.s3.secretKeySecret.key . }}
name: {{ tpl .Values.artifactRepository.s3.secretKeySecret.name . }}
{{- end }}
bucket: {{ .Values.artifactRepository.s3.bucket }}
endpoint: {{ .Values.artifactRepository.s3.endpoint }}
bucket: {{ tpl (.Values.artifactRepository.s3.bucket | default "") . }}
endpoint: {{ tpl (.Values.artifactRepository.s3.endpoint | default "") . }}
insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- if .Values.artifactRepository.s3.keyFormat }}
keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }}
{{- end }}
{{- if .Values.artifactRepository.s3.region }}
region: {{ .Values.artifactRepository.s3.region }}
region: {{ tpl .Values.artifactRepository.s3.region $ }}
{{- end }}
{{- if .Values.artifactRepository.s3.roleARN }}
roleARN: {{ .Values.artifactRepository.s3.roleARN }}
@ -184,4 +184,4 @@ data:
{{- end }}
{{- with .Values.controller.podGCDeleteDelayDuration }}
podGCDeleteDelayDuration: {{ . }}
{{- end }}
{{- end }}

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

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

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

@ -38,7 +38,7 @@ spec:
{{- end }}
{{- with .Values.server.extraInitContainers }}
initContainers:
{{- toYaml . | nindent 8 }}
{{- tpl . $ | toYaml | nindent 8 }}
{{- end }}
containers:
- 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
# the contents in the associated secret, as defined by the `name` attribute.
accessKeySecret:
# name: <releaseName>-minio
name: "{{ .Release.Name }}-minio"
key: accesskey
secretKeySecret:
# name: <releaseName>-minio
name: "{{ .Release.Name }}-minio"
key: secretkey
# insecure will disable TLS. Primarily used for minio installs not configured with TLS
insecure: false