From b238d920df4b8ea78501e8594bcb399e77740c8d Mon Sep 17 00:00:00 2001
From: "Siarhei Poliak [EPAM / GCP]" <siarhei_poliak@epam.com>
Date: Mon, 22 Jan 2024 18:19:57 +0000
Subject: [PATCH] Gonrg 9103 decline the data partition id variable as a system
partition
---
devops/core-plus/pipeline.yml | 2 +-
devops/gc/deploy/README.md | 2 +-
devops/gc/deploy/templates/configmap-bootstrap.yaml | 3 ++-
devops/gc/deploy/values.yaml | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/devops/core-plus/pipeline.yml b/devops/core-plus/pipeline.yml
index 11d8bfb6e..706b284d2 100644
--- a/devops/core-plus/pipeline.yml
+++ b/devops/core-plus/pipeline.yml
@@ -91,7 +91,7 @@ gc-baremetal-deploy: #infra deploy for on-prem install
--set data.logLevel=INFO
--set data.springProfilesActive=$GC_SPRING_PROFILES_ACTIVE
--set data.bucketPrefix=$BUCKET_PREFIX
- --set data.dataPartitionId=$GC_TENANT
+ --set global.dataPartitionId=$GC_TENANT
--set data.groupId=$GROUP_ID
--set data.adminUserEmail=$GC_ADMIN_USER_EMAIL
--set data.airflowComposerEmail=$GC_AIRFLOW_COMPOSER_EMAIL
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index 6da9097cb..ca0213953 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -100,6 +100,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
**global.useHttps** | defines whether to use HTTPS instead of HTTP for external minio s3 endpoint connection | boolean | true | yes
**global.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | true | yes
+**global.dataPartitionId** | data partition id | string | - | yes
### Configmap variables
@@ -111,7 +112,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
**data.dataProjectId** | in case of multiproject cloud installation (services and data stored in different project) the name of data project | string | - | only in case of multiproject installation
**data.partitionHost** | partition host | string | partition | yes
**data.partitionNamespace** | datastore namespace where partition will store the data | string | partition | yes
-**data.dataPartitionId** | data partition id | string | - | yes
**data.datafierSa** | datafier service account | string | datafier | yes
**data.bucketPrefix** | minio bucket name prefix | string | refi | only in case of Reference installation when _springProfilesActive_ is set to "_anthos_"
**data.minioExternalEndpoint** | api url for external minio, if external minio is configured - this value will be set for MINIO_ENDPOINT and MINIO_EXTERNAL_ENDPOINT in bootstrap configmap | string | - | no
diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml
index b66178513..95b4f4e67 100644
--- a/devops/gc/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml
@@ -7,10 +7,10 @@ metadata:
namespace: "{{ .Release.Namespace }}"
data:
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
- DATA_PARTITION_ID: {{ .Values.data.dataPartitionId | quote }}
ENVIRONMENT: {{ .Values.data.springProfilesActive | quote }}
INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
{{- if .Values.global.onPremEnabled }}
+ DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
SERVICE_ACCOUNT: {{ printf "%s@service.local" .Values.data.datafierSa | quote }}
DOMAIN: "{{ .Values.global.domain }}"
BUCKET_PREFIX: {{ .Values.data.bucketPrefix | quote }}
@@ -23,6 +23,7 @@ data:
{{- end }}
MINIO_IGNORE_CERT_CHECK: {{ .Values.data.minioIgnoreCertCheck | quote }}
{{- else }}
+ DATA_PARTITION_ID: {{ "system" }}
{{- if .Values.data.dataProjectId }}
PROJECT_ID: "{{ .Values.data.dataProjectId }}"
{{- else }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 6cc4a8097..3fa66cbd6 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -3,6 +3,7 @@ global:
useHttps: true
onPremEnabled: false
limitsEnabled: true
+ dataPartitionId: ""
data:
# configmaps
@@ -10,7 +11,6 @@ data:
springProfilesActive: "gcp"
projectId: ""
dataProjectId: ""
- dataPartitionId: ""
dataPartitionIdList: []
partitionHost: "partition"
partitionNamespace: "partition"
--
GitLab