Merge branch 'PR-80' into 'master'

PR-80

Closes #2476

See merge request !5646

chart/templates/gitlab/secret-objectstore.yaml

@@ -16,6 +16,8 @@ stringData:
       {{- else if eq .Values.addons.gitlab.objectStorage.iamProfile "" }}
       aws_access_key_id: {{ .Values.addons.gitlab.objectStorage.accessKey }}
       aws_secret_access_key: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
+      {{- end }}
+      {{- if .Values.addons.gitlab.objectStorage.endpoint }}
       endpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
       {{- end }}
       {{- if eq .Values.addons.gitlab.objectStorage.type "minio" }}
@@ -36,6 +38,8 @@ stringData:
         {{- if eq .Values.addons.gitlab.objectStorage.iamProfile "" }}
         accesskey: {{ .Values.addons.gitlab.objectStorage.accessKey }}
         secretkey: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
+        {{- end }}
+        {{- if .Values.addons.gitlab.objectStorage.endpoint }}
         regionendpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
         {{- end }}
         region: {{ .Values.addons.gitlab.objectStorage.region }}