Merge branch 'gitlab-obj' into 'master'

Simplify conditional logic gitlab objectstore

See merge request !2437

chart/templates/gitlab/secret-objectstore.yaml

@@ -36,11 +36,9 @@ stringData:
         {{- if eq .Values.addons.gitlab.objectStorage.iamProfile "" }}
         accesskey: {{ .Values.addons.gitlab.objectStorage.accessKey }}
         secretkey: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
-        {{- end }}
-        region: {{ .Values.addons.gitlab.objectStorage.region }}
-        {{- if eq .Values.addons.gitlab.objectStorage.iamProfile "" }}
         regionendpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
         {{- end }}
+        region: {{ .Values.addons.gitlab.objectStorage.region }}
         {{- if eq .Values.addons.gitlab.objectStorage.type "s3" }}
         v4auth: true
         {{- end }}
@@ -53,11 +51,9 @@ stringData:
       {{- if eq .Values.addons.gitlab.objectStorage.iamProfile "" }} 
       access_key = {{ .Values.addons.gitlab.objectStorage.accessKey }}
       secret_key = {{ .Values.addons.gitlab.objectStorage.accessSecret }}
-      {{- end }}
-      bucket_location = {{ .Values.addons.gitlab.objectStorage.region }}
-      {{- if eq .Values.addons.gitlab.objectStorage.iamProfile "" }}
       host_bucket = %(bucket)s.{{ regexReplaceAll "http(s*)://" .Values.addons.gitlab.objectStorage.endpoint "" }}
       {{- end }}
+      bucket_location = {{ .Values.addons.gitlab.objectStorage.region }}
       multipart_chunk_size_mb = 128
 {{- end }}
 {{- end }}