Merge branch '1317-gitlab-logic' into 'master'

Updating endpoint logic in gitlab objectstorage secret

See merge request platform-one/big-bang/bigbang!2197

chart/templates/gitlab/secret-objectstore.yaml

@@ -17,10 +17,11 @@ stringData:
       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" }}
       aws_signature_version: 4
-      host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectStorage.endpoint "${2}" }}
-      endpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
       path_style: true
       {{- end }}
     registry: |-
@@ -39,13 +40,14 @@ stringData:
         secretkey: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
         {{- end }}
         region: {{ .Values.addons.gitlab.objectStorage.region }}
+        {{- if .Values.addons.gitlab.objectStorage.endpoint }}
+        regionendpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
+        {{- end }}
         {{- if eq .Values.addons.gitlab.objectStorage.type "s3" }}
         v4auth: true
         {{- end }}
         {{- if eq .Values.addons.gitlab.objectStorage.type "minio" }}
         aws_signature_version: 4
-        host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectStorage.endpoint "${2}" }}
-        regionendpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
         path_style: true
         {{- end }}
     backups: |-