diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..5b462cccdadf92874f22e8ef07043baace8eebf9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +root = true + +[*] +insert_final_newline = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..6313b56c57848efce05faa7aa7e901ccfc2886ea --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/devops/gcp/configmap/README.md b/devops/gcp/configmap/README.md index caa9767d87cc05bf6da071d746b4b1909dfbe00f..57dc3db04b3520c4e7d72a079385535a0aaebfbb 100644 --- a/devops/gcp/configmap/README.md +++ b/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 diff --git a/devops/gcp/configmap/templates/configmap-bootstrap.yml b/devops/gcp/configmap/templates/configmap-bootstrap.yml index ae34b91600ab2b81fb704cb985db7abe4e000eec..a39b426b2e4169976d829a8eb6ba665303f16414 100644 --- a/devops/gcp/configmap/templates/configmap-bootstrap.yml +++ b/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 }} diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml index 2d8977d3ce94514c4b8dd863ad64c8e87d7705d6..b0b7f10c887595945e886a09fe811b46a14bf238 100644 --- a/devops/gcp/configmap/values.yaml +++ b/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" diff --git a/provider/partition-gcp/bootstrap/data_anthos.sh b/provider/partition-gcp/bootstrap/data_anthos.sh index 34e6c11f5641e5323a17e6f128cb23dba69dc4ec..6de13608e238d978488a8a8a2b4d7b5c79e7e620 100644 --- a/provider/partition-gcp/bootstrap/data_anthos.sh +++ b/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,