changes to reflect minio rework

This commit is contained in:
Louis Murray 2018-05-31 18:46:11 -04:00 committed by Louis Murray
parent 63c656b971
commit cf3fd8eb0c

View file

@ -6,7 +6,7 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
namespace: {{ .Release.namespace }} namespace: {{ .Release.Namespace }}
data: data:
config: | config: |
{{- if .Values.controller.useReleaseAsInstanceID }} {{- if .Values.controller.useReleaseAsInstanceID }}
@ -15,7 +15,7 @@ data:
instanceID: {{ .Values.controller.instanceID }} instanceID: {{ .Values.controller.instanceID }}
{{- end }} {{- end }}
artifactRepository: artifactRepository:
{{- if or .Values.installMinio .Values.useDefaultArtifactRepo }} {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
s3: s3:
{{- if .Values.useStaticCredentials }} {{- if .Values.useStaticCredentials }}
accessKeySecret: accessKeySecret:
@ -25,7 +25,7 @@ data:
key: {{ .Values.artifactRepository.s3.secretKeySecret.key }} key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
name: {{ .Values.artifactRepository.s3.secretKeySecret.name | 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.artifactRepository.s3.bucket | default .Values.minioBucketName }} bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minio.defaultBucket.name }}
endpoint: {{ .Values.artifactRepository.s3.endpoint | 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.artifactRepository.s3.insecure }} insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- end}} {{- end}}