Merge branch 'GONRG-9205_remove_DATA_PARTITION_ID_LIST' into 'master'

[GONRG-9205]: remove DATA_PARTITION_ID_LIST

See merge request !527

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

@@ -10,9 +10,8 @@ data:
   ENVIRONMENT: {{ .Values.data.springProfilesActive | quote }}
   INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
   PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
-  {{- if .Values.global.onPremEnabled }}
   DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
-  DATA_PARTITION_ID_LIST: ""
+  {{- if .Values.global.onPremEnabled }}
   SERVICE_ACCOUNT: {{ printf "%s@service.local" .Values.data.datafierSa | quote }}
   DOMAIN: "{{ .Values.global.domain }}"
   BUCKET_PREFIX: {{ .Values.data.bucketPrefix | quote }}
@@ -25,7 +24,6 @@ data:
   {{- end }}
   MINIO_IGNORE_CERT_CHECK: {{ .Values.data.minioIgnoreCertCheck | quote }}
   {{- else }}
-  DATA_PARTITION_ID_LIST: {{ .Values.global.dataPartitionId | quote }}
   {{- if .Values.data.dataProjectId }}
   PROJECT_ID: "{{ .Values.data.dataProjectId }}"
   {{- else }}

provider/partition-gc/bootstrap/bootstrap_partition.sh

@@ -42,31 +42,18 @@ bootstrap_partition() {
 
 # Bootstrap system partition
 if [[ "${ENVIRONMENT}" == "gcp" ]]; then
-  export DATA_PARTITION_ID="system"
+  # Specifying "system" partition for GC installation 
+  export SYSTEM_PARTITION_ID="system"
+  export DATA_PARTITION_ID_VALUE="${SYSTEM_PARTITION_ID}"
+  bootstrap_partition "${SYSTEM_PARTITION_ID}" "$(gc_system_partition_data)"
+  
+  # Bootstrap additional partition
   export DATA_PARTITION_ID_VALUE="${DATA_PARTITION_ID}"
-  bootstrap_partition "${DATA_PARTITION_ID}" "$(gc_system_partition_data)"
+  additional_partition_data=$(merge "gc_system_partition_data" "gc_additional_partition_data")
+  bootstrap_partition "${DATA_PARTITION_ID}" "$additional_partition_data"
 elif [[ "${ENVIRONMENT}" == "anthos" ]]; then
   export DATA_PARTITION_ID_VALUE="${DATA_PARTITION_ID}"
   bootstrap_partition "${DATA_PARTITION_ID}" "$(baremetal_system_partition_data)"
 fi
 
-# Bootstrap additional partitions
-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
-elif [[ "${ENVIRONMENT}" == "anthos" && "${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 "baremetal_system_partition_data" "baremetal_additional_partition_data")
-    bootstrap_partition "${PARTITION}" "$additional_partition_data"
-  done
-fi
-
 touch /tmp/bootstrap_ready