Commit f3da63ae authored by Mikhail Piatliou (EPAM)'s avatar Mikhail Piatliou (EPAM)
Browse files

Merge branch 'master' into gcp-int-tests-anthos

parents b5e522af 7c1d57bf
Pipeline #111289 failed with stages
in 7 seconds
......@@ -9,11 +9,10 @@ data:
PARTITION_NAME: "{{ .Values.data.partitionName }}.{{ .Release.Namespace }}.svc.cluster.local"
PROJECT_ID: "{{ .Values.data.projectId }}"
DATA_PARTITION_ID: "{{ .Values.data.dataPartitionId }}"
DATAFIER_SA: "{{ .Values.data.datafierSa }}"
ENVIRONMENT: "{{ .Values.data.springProfilesActive }}"
{{- if .Values.conf.onPremEnabled }}
DOMAIN: "{{ .Values.data.domain }}"
ENVIRONMENT: "{{ .Values.data.environment }}"
CLIENT_ID: "{{ .Values.data.clientId }}"
{{- else }}
AUDIENCES: "{{ .Values.data.googleAudiences }}"
DATAFIER_SA: "{{ .Values.data.datafierSa }}"
{{- end }}
......@@ -8,9 +8,7 @@ metadata:
data:
LOG_LEVEL: "{{ .Values.data.logLevel }}"
SPRING_PROFILES_ACTIVE: "{{ .Values.data.springProfilesActive }}"
{{- if .Values.conf.onPremEnabled }}
PARTITION_NAMESPACE: "{{ .Values.data.partitionNamespace }}"
{{- else }}
{{- if not .Values.conf.onPremEnabled }}
GOOGLE_CLOUD_PROJECT: "{{ .Values.data.projectId }}"
PARTITION_ADMIN_ACCOUNTS: "{{ .Values.data.partitionAdminAccounts }}"
GOOGLE_AUDIENCES: "{{ .Values.data.googleAudiences }}"
......
data:
# common
logLevel: "INFO"
springProfilesActive: "gcp"
# gcp
projectId: ""
partitionAdminAccounts: ""
googleAudiences: ""
logLevel: "INFO"
serviceAccountTail: ".iam.gserviceaccount.com"
# FIXME GONRG-4910
partitionNamespace: ""
springProfilesActive: "gcp"
# bootstrap common
partitionName: "partition"
dataPartitionId: ""
datafierSa: "datafier"
# bootstrap variables onprem
domain: ""
environment: ""
clientId: "datafier"
conf:
configmap: "partition-config"
appName: "partition"
......
......@@ -136,7 +136,7 @@ EOF
if [ "$ENVIRONMENT" == "anthos" ]
then
SERVICEACCOUNT=$CLIENT_ID@service.local
SERVICEACCOUNT=$DATAFIER_SA@service.local
status_code=$(curl -X POST \
--url "http://${PARTITION_NAME}/api/partition/v1/partitions/${DATA_PARTITION_ID}" --write-out "%{http_code}" --silent --output "/dev/null" \
......@@ -157,8 +157,7 @@ then
exit 1
fi
# FIXME "$ENVIRONMENT" == "gcp" or use another variable
elif [ "$ENVIRONMENT" == "" ]
elif [ "$ENVIRONMENT" == "gcp" ]
then
echo "sleep to prevent 500 response from the Partition service, due to timeout of creation for Workload Identity"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment