Merge branch 'GONRG-7885-Fix-Partition-Bootstrap' into 'master'

[GONRG-7885] Fixed partition bootstrap

See merge request !457

provider/partition-gc/bootstrap/bootstrap_partition.sh

@@ -42,8 +42,10 @@ bootstrap_partition() {
 
 # Bootstrap system partition
 if [[ "${ENVIRONMENT}" == "gcp" ]]; then
+  export DATA_PARTITION_ID_VALUE="${DATA_PARTITION_ID}"
   bootstrap_partition "${DATA_PARTITION_ID}" "$(gc_system_partition_data)"
 elif [[ "${ENVIRONMENT}" == "anthos" ]]; then
+  export DATA_PARTITION_ID_VALUE="${DATA_PARTITION_ID}"
   bootstrap_partition "${DATA_PARTITION_ID}" "$(baremetal_system_partition_data)"
 fi
 
@@ -52,6 +54,7 @@ if [[ "${ENVIRONMENT}" == "gcp" && "${DATA_PARTITION_ID_LIST}" != "" ]]; then
   IFS=',' read -ra PARTITIONS <<< "${DATA_PARTITION_ID_LIST}"
 
   for PARTITION in "${PARTITIONS[@]}"; do
+    export DATA_PARTITION_ID_VALUE="${PARTITION}"
     additional_partition_data=$(merge "gc_system_partition_data" "gc_additional_partition_data")
     bootstrap_partition "${PARTITION}" "$additional_partition_data"
   done
@@ -59,6 +62,7 @@ elif [[ "${ENVIRONMENT}" == "anthos" && "${DATA_PARTITION_ID_LIST}" != "" ]]; th
   IFS=',' read -ra PARTITIONS <<< "${DATA_PARTITION_ID_LIST}"
 
   for PARTITION in "${PARTITIONS[@]}"; do
+    export DATA_PARTITION_ID_VALUE="${PARTITION}"
     additional_partition_data=$(merge "baremetal_system_partition_data" "baremetal_additional_partition_data")
     bootstrap_partition "${PARTITION}" "$additional_partition_data"
   done

provider/partition-gc/bootstrap/data_baremetal.sh

@@ -3,7 +3,7 @@
 # FIXME (GONRG-7695): Move elastic properties to additional partition when resolved
 # FIXME (GONRG-7696): Move rabbitmq properties to additional partition when resolved
 baremetal_system_partition_data() {
-  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID^^}"
+  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID_VALUE^^}"
   cat <<EOF
 {
   "properties": {
@@ -21,19 +21,19 @@ baremetal_system_partition_data() {
     },
     "dataPartitionId": {
       "sensitive": false,
-      "value": "${DATA_PARTITION_ID}"
+      "value": "${DATA_PARTITION_ID_VALUE}"
     },
     "name": {
       "sensitive": false,
-      "value": "${DATA_PARTITION_ID}"
+      "value": "${DATA_PARTITION_ID_VALUE}"
     },
     "bucket": {
       "sensitive": false,
-      "value": "${BUCKET_PREFIX}-${DATA_PARTITION_ID}-records"
+      "value": "${BUCKET_PREFIX}-${DATA_PARTITION_ID_VALUE}-records"
     },
     "crmAccountID": {
       "sensitive": false,
-      "value": "[${DATA_PARTITION_ID},${DATA_PARTITION_ID}]"
+      "value": "[${DATA_PARTITION_ID_VALUE},${DATA_PARTITION_ID_VALUE}]"
     },
     "osm.postgres.datasource.url": {
       "sensitive": true,
@@ -65,7 +65,7 @@ baremetal_system_partition_data() {
     },
     "kubernetes-secret-name": {
       "sensitive": false,
-      "value": "eds-${DATA_PARTITION_ID}"
+      "value": "eds-${DATA_PARTITION_ID_VALUE}"
     },
     "oqm.rabbitmq.amqp.host": {
       "sensitive": false,
@@ -133,7 +133,7 @@ EOF
 }
 
 baremetal_additional_partition_data() {
-  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID^^}"
+  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID_VALUE^^}"
   cat <<EOF
 {
   "properties": {

provider/partition-gc/bootstrap/data_gc.sh

@@ -2,7 +2,7 @@
 
 # FIXME (GONRG-7695): Move elastic properties to additional partition when resolved
 gc_system_partition_data() {
-  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID^^}"
+  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID_VALUE^^}"
   cat <<EOF
 {
   "properties": {
@@ -20,23 +20,23 @@ gc_system_partition_data() {
     },
     "dataPartitionId": {
       "sensitive": false,
-      "value": "${DATA_PARTITION_ID}"
+      "value": "${DATA_PARTITION_ID_VALUE}"
     },
     "name": {
       "sensitive": false,
-      "value": "${DATA_PARTITION_ID}"
+      "value": "${DATA_PARTITION_ID_VALUE}"
     },
     "bucket": {
       "sensitive": false,
-      "value": "${PROJECT_ID}-${DATA_PARTITION_ID}-records"
+      "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-records"
     },
     "seismicBucket": {
       "sensitive": false,
-      "value": "${PROJECT_ID}-${DATA_PARTITION_ID}-ss-seismic"
+      "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-ss-seismic"
     },
     "crmAccountID": {
       "sensitive": false,
-      "value": "[${DATA_PARTITION_ID},${DATA_PARTITION_ID}]"
+      "value": "[${DATA_PARTITION_ID_VALUE},${DATA_PARTITION_ID_VALUE}]"
     },
     "elasticsearch.host": {
       "sensitive": true,
@@ -69,7 +69,7 @@ gc_additional_partition_data() {
     },
     "kubernetes-secret-name": {
       "sensitive": false,
-      "value": "eds-${DATA_PARTITION_ID}"
+      "value": "eds-${DATA_PARTITION_ID_VALUE}"
     },
     "index-augmenter-enabled": {
       "sensitive": false,