Merge branch 'GONRG-4886-using-external-s3' into 'master'

GONRG-4886: using external s3

See merge request !228

devops/gcp/configmap/README.md

@@ -127,6 +127,7 @@ cat ~/.config/gcloud/application_default_credentials.json | grep client_id
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
 **domain** | your domain | string | - | yes
+**minioExternalEndpoint** | api url for external minio, if external minio is configured - this value will be set for MINIO_ENDPOINT and FILE_MINIO_ENDPOINT in bootstrap configmap| string | - | no
 
 ### Config variables
 

devops/gcp/configmap/templates/configmap-bootstrap.yml

@@ -19,6 +19,8 @@ data:
   {{- if .Values.conf.onPremEnabled }}
   SERVICE_ACCOUNT: {{ printf "%s@service.local" .Values.data.datafierSa | quote }}
   DOMAIN: "{{ .Values.data.domain }}"
+  MINIO_ENDPOINT: "{{ default "http://minio:9000" .Values.data.minioExternalEndpoint }}"
+  FILE_MINIO_ENDPOINT: "{{ default (printf "https://s3.%s" .Values.data.domain) .Values.data.minioExternalEndpoint }}"
   {{- else }}
   AUDIENCES: "{{ .Values.data.googleAudiences }}"
   {{- end }}

devops/gcp/configmap/values.yaml

@@ -15,6 +15,7 @@ data:
   partitionCleanUpEnabled: "false"
   # bootstrap variables onprem
   domain: ""
+  minioExternalEndpoint: "" # use only if external minio is configured
 conf:
   configmap: "partition-config"
   appName: "partition"

provider/partition-gcp/bootstrap/data_anthos.sh

@@ -52,7 +52,7 @@ generate_post_data_anthos() {
     },
     "file.minio.endpoint": {
       "sensitive": false,
-      "value": "https://s3.${DOMAIN}"
+      "value": "${FILE_MINIO_ENDPOINT}"
     },
     "file.minio.accessKey": {
       "sensitive": true,
@@ -64,7 +64,7 @@ generate_post_data_anthos() {
     },
     "obm.minio.endpoint": {
       "sensitive": false,
-      "value": "http://minio:9000"
+      "value": "${MINIO_ENDPOINT}"
     },
     "obm.minio.accessKey": {
       "sensitive": true,