artifactRepository values follow tree structure

This commit is contained in:
Lukasz Lempart 2018-03-15 15:05:07 -07:00
parent 2b9afc180d
commit 84a8800881
2 changed files with 15 additions and 10 deletions

View file

@ -18,14 +18,14 @@ data:
s3: s3:
{{- if .Values.useStaticCredentials }} {{- if .Values.useStaticCredentials }}
accessKeySecret: accessKeySecret:
key: {{ .Values.artifactAccessKeySecret }} key: {{ .Values.artifactRepository.s3.accessKeySecret.key }}
name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }} name: {{ .Values.artifactRepository.s3.accessKeySecret.name | default (printf "%s-%s" .Release.Name "minio-user") }}
secretKeySecret: secretKeySecret:
key: {{ .Values.artifactSecretKeySecret }} key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }} name: {{ .Values.artifactRepository.s3.secretKeySecret.name | default (printf "%s-%s" .Release.Name "minio-user") }}
{{- end }} {{- end }}
bucket: {{ .Values.artifactBucketName | default .Values.minioBucketName }} bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minioBucketName }}
endpoint: {{ .Values.artifactEndpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }} endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }}
insecure: {{ .Values.artifactInsecure }} insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- end}} {{- end}}
executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}" executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}"

View file

@ -21,6 +21,11 @@ useStaticCredentials: true
# If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map # If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map
installMinio: true installMinio: true
minioBucketName: argo-artifacts minioBucketName: argo-artifacts
artifactAccessKeySecret: accesskey
artifactSecretKeySecret: secretkey artifactRepository:
artifactInsecure: true s3:
accessKeySecret:
key: accesskey
secretKeySecret:
key: secretkey
insecure: true