Merge branch 'master' into master
This commit is contained in:
commit
be9ecd2807
2 changed files with 4 additions and 0 deletions
|
@ -36,6 +36,9 @@ data:
|
||||||
{{- if .Values.artifactRepository.s3.keyPrefix }}
|
{{- if .Values.artifactRepository.s3.keyPrefix }}
|
||||||
keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }}
|
keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.artifactRepository.s3.region }}
|
||||||
|
region: {{ .Values.artifactRepository.s3.region }}
|
||||||
|
{{- end }}
|
||||||
{{- end}}
|
{{- end}}
|
||||||
{{- if .Values.controller.metricsConfig.enabled }}
|
{{- if .Values.controller.metricsConfig.enabled }}
|
||||||
metricsConfig:
|
metricsConfig:
|
||||||
|
|
|
@ -190,6 +190,7 @@ artifactRepository:
|
||||||
insecure: true
|
insecure: true
|
||||||
# bucket:
|
# bucket:
|
||||||
# endpoint:
|
# endpoint:
|
||||||
|
# region:
|
||||||
|
|
||||||
# NOTE: These are setting attributes for the `minio` optional dependency
|
# NOTE: These are setting attributes for the `minio` optional dependency
|
||||||
minio:
|
minio:
|
||||||
|
|
Loading…
Reference in a new issue