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

Merge branch 'master' into AllowCustomPathsForServerIngress

Browse source
This commit is contained in:
Mark Haley 2020-04-24 16:02:35 -04:00 committed by GitHub
commit e510d02f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,9 @@ data:
{{- if .Values.artifactRepository.s3.keyPrefix }}
keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }}
{{- end }}
{{- if .Values.artifactRepository.s3.region }}
region: {{ .Values.artifactRepository.s3.region }}
{{- end }}
{{- end}}
{{- if .Values.controller.metricsConfig.enabled }}
metricsConfig:

1
charts/argo/values.yaml
View file

@ -195,6 +195,7 @@ artifactRepository:
insecure: true
# bucket:
# endpoint:
# region:
# NOTE: These are setting attributes for the `minio` optional dependency
minio: