Add artifacthub changes

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

View file

@ -14,4 +14,4 @@ maintainers:
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - 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

View file

@ -69,20 +69,20 @@ data:
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 }}
@ -184,4 +184,4 @@ data:
{{- end }} {{- end }}
{{- with .Values.controller.podGCDeleteDelayDuration }} {{- with .Values.controller.podGCDeleteDelayDuration }}
podGCDeleteDelayDuration: {{ . }} podGCDeleteDelayDuration: {{ . }}
{{- end }} {{- end }}

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

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

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