Merge branch 'gc_fix_dev2_and_preship_cm' into 'master'

fix: [GONRG-6572] GC fix deploys and CMs

See merge request !672

app/sdms/devops/gc/deploy/templates/seismic-store-configmap.yaml

@@ -15,7 +15,7 @@ data:
   DES_SERVICE_HOST_PARTITION: {{ ternary .Values.data.partitionHost (printf "%s/api/partition/v1/" .Values.data.partitionHost) .Values.global.onPremEnabled | quote}}
   ENTITLEMENT_BASE_URL_PATH: {{ .Values.data.entitlementBaseUrlPath | quote }}
   DATA_PARTITION_REST_HEADER_KEY: {{ .Values.data.dataPartitionRestHeaderKey | quote }}
-  DES_SERVICE_HOST_STORAGE: {{ ternary .Values.data.storageHost (printf "%s/api/storage/v2" .Values.data.storageHost) .Values.global.onPremEnabled | quote}}
+  DES_SERVICE_HOST_STORAGE: {{ ternary .Values.data.storageHost (printf "%s/api" .Values.data.storageHost) .Values.global.onPremEnabled | quote}}
   DES_SERVICE_HOST_COMPLIANCE: {{ ternary .Values.data.legalHost (printf "%s/api" .Values.data.legalHost) .Values.global.onPremEnabled | quote}}
   {{- if not .Values.global.onPremEnabled }}
   IMP_SERVICE_ACCOUNT_SIGNER: {{ .Values.data.impServiceAccountSigner | quote }}

devops/osdu/cloud-providers/gc-common-pipeline.yml

 variables:
   GC_GCR_REGISTRY: "gcr.io/osdu-anthos"
   APP_VERSION: "$GC_HELM_PACKAGE_VERSION-SNAPSHOT"
-  
+
 .common:
   script:
     - gcloud auth activate-service-account --key-file $GC_DEPLOY_FILE
@@ -124,7 +124,6 @@ variables:
       if [[ "$STATUS" != *"met"* ]];
       then echo "POD didn't start correctly"; exit 1; fi
 
-
 .gc-helm-charts-gitlab:
   stage: containerize
   tags: ["osdu-small"]
@@ -186,7 +185,6 @@ variables:
     - if: '$GC == "1" && $CI_COMMIT_TAG'
       when: on_success
 
-
 .gc-containerize-gitlab:
   stage: containerize
   tags: ["osdu-medium"]
@@ -244,6 +242,8 @@ variables:
       --set data.image=$CI_REGISTRY_IMAGE/gc-$SEISMIC_GC_SERVICE:$CI_COMMIT_SHORT_SHA
       --set data.serviceAccountName=$SEISMIC_GC_SERVICE-k8s
       --set global.domain=$DOMAIN
+      --set data.googleAudiences=$GOOGLE_AUDIENCE
+      --set data.serviceCloudProject=$GC_PROJECT
     - !reference [.verify_deploy, script]
   rules:
     - if: '$GC == "1" && $CI_COMMIT_BRANCH =~ /^release/'
@@ -273,6 +273,9 @@ variables:
       --set data.imagePullPolicy=Always
       --set data.serviceAccountName=$SEISMIC_GC_SERVICE-k8s
       --set global.domain=$DOMAIN
+      --set data.appEnvironmentIdentifier=$DATA_PARTITION_ID
+      --set data.googleAudiences=$GOOGLE_AUDIENCE
+      --set data.serviceCloudProject=$GC_PROJECT
     - !reference [.verify_deploy, script]
   rules:
     - if: '$GC == "1" && $CI_COMMIT_BRANCH =~ /^release/'
@@ -301,6 +304,10 @@ variables:
       --set data.image=$CI_REGISTRY_IMAGE/$IMAGE_NAME:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
       --set data.imagePullPolicy=Always
       --set data.serviceAccountName=$SEISMIC_GC_SERVICE-k8s
+      --set data.appEnvironmentIdentifier=$DATA_PARTITION_ID
+      --set data.googleAudiences=$GOOGLE_AUDIENCE
+      --set data.serviceCloudProject=$GC_PROJECT
+      --set global.domain=$GC_DOMAIN
     - !reference [.verify_deploy, script]
   rules:
     - if: '$GC == "1" && $CI_COMMIT_TAG'
@@ -332,7 +339,7 @@ variables:
       --set data.cloudProvider=anthos
       --set data.image=$CI_REGISTRY_IMAGE/gc-$SEISMIC_GC_SERVICE:$CI_COMMIT_SHORT_SHA
       --set data.serviceAccountName=$SEISMIC_GC_SERVICE
-      --set global.domain=$DOMAIN
+      --set global.domain=$GC_DOMAIN
       --set global.onPremEnabled=true
     - !reference [.verify_deploy, script]
   rules: