Gonrg 9930 datastore parametrization

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

+{{- $databaseId := "" -}}
+{{- if eq .Values.data.databaseId "" }}
+  {{- fail "ERROR Add databaseId value" }}
+{{- else if eq .Values.data.databaseId "(default)" }}
+  {{- $databaseId = "" -}}
+{{- else }}
+  {{- $databaseId = .Values.data.databaseId -}}
+{{- end }}
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -19,3 +28,4 @@ data:
   PROJECT_ID: "{{ .Values.data.projectId }}"
   {{- end }}
   SERVICE_ACCOUNT: {{ printf "%s@%s.iam.gserviceaccount.com" .Values.data.datafierSa .Values.data.projectId | quote }}
+  DATABASE_ID: "{{ $databaseId }}"

devops/gc/deploy/templates/configmap.yaml

+{{- $databaseId := "" -}}
+{{- if eq .Values.data.databaseId "" }}
+  {{- fail "ERROR Add databaseId value" }}
+{{- else if eq .Values.data.databaseId "(default)" }}
+  {{- $databaseId = "" -}}
+{{- else }}
+  {{- $databaseId = .Values.data.databaseId -}}
+{{- end }}
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -12,3 +21,4 @@ data:
   PARTITION_NAMESPACE: {{ .Values.data.partitionNamespace | quote }}
   SYSTEM_PARTITION_ID: "system"
   SPRING_PROFILES_ACTIVE: "gcp"
+  DATABASE_ID: "{{ $databaseId }}"

devops/gc/deploy/values.yaml

@@ -20,6 +20,7 @@ data:
   policyServiceEnabled: "true"
   edsEnabled: "false"
   autocompleteEnabled: "true"
+  databaseId: ""
   # deployments
   requestsCpu: "5m"
   requestsMemory: "350Mi"

devops/gc/pipeline/override-stages.yml

@@ -36,6 +36,7 @@ gc-deploy: # reuse common deploy job for test deployment
       --set data.partitionNamespace=partition-test
       --set istio.sidecarInject=false
       --set data.edsEnabled=true
+      --set data.databaseId=\(default\)
     GC_SA_EMAIL: $GC_SA_GKE_EMAIL
 
 gc-test:
@@ -81,6 +82,7 @@ gc-verified-deploy: # verified deploy after tests
     # GC_HELM_SETS is blanked since values from gc-deploy is not compatible
     GC_HELM_SETS: >-
       --set data.edsEnabled=true
+      --set data.databaseId=\(default\)
 
 # Dev2 jobs
 gc-dev2-deploy: # reuse common deploy job for test deployment
@@ -91,6 +93,7 @@ gc-dev2-deploy: # reuse common deploy job for test deployment
       --set data.partitionNamespace=partition-test
       --set istio.sidecarInject=false
       --set data.edsEnabled=true
+      --set data.databaseId=\(default\)
     GC_SA_EMAIL: $GC_SA_GKE_EMAIL
 
 gc-dev2-test:
@@ -135,6 +138,7 @@ gc-dev2-verified-deploy: # verified deploy after tests
     GC_TENANT: devtwo
     GC_HELM_SETS: >-
       --set data.edsEnabled=true
+      --set data.databaseId=\(default\)
 
 gc-preship-deploy:
   extends: .gc-preship-variables
@@ -146,3 +150,4 @@ gc-preship-deploy:
     GC_HELM_SETS: >-
       --set global.dataPartitionId=m19
       --set data.edsEnabled=true
+      --set data.databaseId=\(default\)

provider/partition-gc/bootstrap/data_gc.sh

@@ -61,6 +61,10 @@ gc_partition_data() {
       "sensitive": false,
       "value": "${INDEXER_AUGMENTER_ENABLED}"
     },
+    "osm.datastore.database.id": {
+      "sensitive": false,
+      "value": "${DATABASE_ID}"
+    },
     "wellbore-dms-bucket": {
       "sensitive": false,
       "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-wellbore"

provider/partition-gc/bootstrap/system_gc.sh

@@ -29,6 +29,10 @@ gc_system_partition_data() {
       "sensitive": false,
       "value": "[${DATA_PARTITION_ID_VALUE},${DATA_PARTITION_ID_VALUE}]"
     },
+    "osm.datastore.database.id": {
+      "sensitive": false,
+      "value": "${DATABASE_ID}"
+    },
     "entitlements.datasource.url": {
       "sensitive": true,
       "value": "ENT_PG_URL${PARTITION_SUFFIX}"