GONRG-6573: File service always use https s3 endpoint

NOTICE

@@ -391,8 +391,8 @@ The following software have components provided under the terms of this license:
 - 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 HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http, 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/tree/master/google-cloud-clients/google-cloud-core-grpc, https://github.com/googleapis/java-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)
 - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/java-iamcredentials)
 - Google Cloud Logging (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging, https://github.com/googleapis/java-logging)

devops/gc/deploy/README.md

@@ -129,6 +129,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **conf.domain** | your domain | string | - | yes
 **conf.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
 **conf.secret** | secret for postgres | string | partition-postgres-secret | yes
+**conf.domainTlsEnabled** | whether TLS is enabled in domain - defines whether to use HTTPS instead of HTTP for connection to the minio s3 endpoint | boolean | true | yes
 **auth.realm** | realm in keycloak | string | osdu | yes
 
 ### ISTIO variables

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

@@ -14,8 +14,12 @@ data:
   DOMAIN: "{{ .Values.conf.domain }}"
   BUCKET_PREFIX: {{ .Values.data.bucketPrefix | quote }}
   MINIO_ENDPOINT: {{ default "http://minio:9000" .Values.data.minioExternalEndpoint | quote }}
+  {{- if .Values.conf.domainTlsEnabled }}
   FILE_MINIO_ENDPOINT: {{ default (printf "https://s3.%s" .Values.conf.domain) .Values.data.minioExternalEndpoint | quote }}
   {{- else }}
+  FILE_MINIO_ENDPOINT: {{ default (printf "http://s3.%s" .Values.conf.domain) .Values.data.minioExternalEndpoint | quote }}
+  {{- end }}
+  {{- else }}
   {{- if .Values.data.dataProjectId }}
   PROJECT_ID: "{{ .Values.data.dataProjectId }}"
   {{- else }}

devops/gc/deploy/values.yaml

@@ -27,6 +27,7 @@ conf:
   domain: ""
   onPremEnabled: false
   secret: "partition-postgres-secret"
+  domainTlsEnabled: true
 auth:
   realm: "osdu"
 istio: