GONRG-6771: Update bootstrap for minio external endpoint

NOTICE

@@ -390,7 +390,7 @@ The following software have components provided under the terms of this license:
 - GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
 - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
 - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
-- Google Cloud Core (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core, https://github.com/googleapis/java-core)
+- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core, https://github.com/googleapis/java-core, https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core)
 - Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http, https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http, https://github.com/googleapis/java-core)
 - Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc, https://github.com/googleapis/java-core)
 - Google Cloud Datastore (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore, https://github.com/googleapis/java-datastore)

devops/gc/deploy/README.md

@@ -114,7 +114,8 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **data.datafierSa** | datafier service account | string | datafier | yes
 **data.indexerSa** | indexer service account | string | workload-indexer-gcp | yes
 **data.bucketPrefix** | minio bucket name prefix | string | refi | only in case of Reference installation when _springProfilesActive_ is set to "_anthos_"
-**data.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
+**data.minioExternalEndpoint** | api url for external minio, if external minio is configured - this value will be set for MINIO_ENDPOINT and MINIO_EXTERNAL_ENDPOINT in bootstrap configmap | string | - | no
+**data.minioIgnoreCertCheck** | whether minio should ignore TLS certs validity check, set to true if external minio is protected by self-signed certificates | string | false | no
 
 ### Deployment variables
 

devops/gc/deploy/templates/configmap-bootstrap.yaml

@@ -16,10 +16,11 @@ data:
   BUCKET_PREFIX: {{ .Values.data.bucketPrefix | quote }}
   MINIO_ENDPOINT: {{ default "http://minio:9000" .Values.data.minioExternalEndpoint | quote }}
   {{- if .Values.global.useHttps }}
-  FILE_MINIO_ENDPOINT: {{ default (printf "https://s3.%s" .Values.global.domain) .Values.data.minioExternalEndpoint | quote }}
+  MINIO_EXTERNAL_ENDPOINT: {{ default (printf "https://s3.%s" .Values.global.domain) .Values.data.minioExternalEndpoint | quote }}
   {{- else }}
-  FILE_MINIO_ENDPOINT: {{ default (printf "http://s3.%s" .Values.global.domain) .Values.data.minioExternalEndpoint | quote }}
+  MINIO_EXTERNAL_ENDPOINT: {{ default (printf "http://s3.%s" .Values.global.domain) .Values.data.minioExternalEndpoint | quote }}
   {{- end }}
+  MINIO_IGNORE_CERT_CHECK: {{ .Values.data.minioIgnoreCertCheck | quote }}
   {{- else }}
   {{- if .Values.data.dataProjectId }}
   PROJECT_ID: "{{ .Values.data.dataProjectId }}"

devops/gc/deploy/values.yaml

@@ -17,6 +17,7 @@ data:
   indexerSa: "workload-indexer-gcp"
   bucketPrefix: "refi"
   minioExternalEndpoint: "" # use only if external minio is configured
+  minioIgnoreCertCheck: "false"
   # deployments
   requestsCpu: "10m"
   requestsMemory: "400Mi"

provider/partition-gc/bootstrap/data_anthos.sh

@@ -48,18 +48,6 @@ generate_post_data_anthos() {
       "sensitive": true,
       "value": "POSTGRES_DB_PASSWORD_${DATA_PARTITION_ID_UPPER}"
     },
-    "file.minio.endpoint": {
-      "sensitive": false,
-      "value": "${FILE_MINIO_ENDPOINT}"
-    },
-    "file.minio.accessKey": {
-      "sensitive": true,
-      "value": "MINIO_ACCESS_KEY"
-    },
-    "file.minio.secretKey": {
-      "sensitive": true,
-      "value": "MINIO_SECRET_KEY"
-    },
     "obm.minio.endpoint": {
       "sensitive": false,
       "value": "${MINIO_ENDPOINT}"
@@ -72,6 +60,14 @@ generate_post_data_anthos() {
       "sensitive": true,
       "value": "MINIO_SECRET_KEY"
     },
+    "obm.minio.ignoreCertCheck": {
+      "sensitive": false,
+      "value": "${MINIO_IGNORE_CERT_CHECK}"
+    },
+    "obm.minio.external.endpoint": {
+      "sensitive": false,
+      "value": "${MINIO_EXTERNAL_ENDPOINT}"
+    },
     "oqm.rabbitmq.amqp.host": {
       "sensitive": false,
       "value": "rabbitmq"