Commit ef47bd44 authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

Merge branch 'gcp-update-gke-sa' into 'master'

Update GKE SA to follow common naming convention [GONRG-4113]

See merge request !96
parents 430b0f5e 778139a9
Pipeline #86359 passed with stages
in 21 minutes and 28 seconds
......@@ -3,7 +3,6 @@ variables:
OSDU_GCP_SERVICE: crs-catalog
OSDU_GCP_VENDOR: gcp
OSDU_GCP_APPLICATION_NAME: os-crs-catalog
OSDU_GCP_ENV_VARS: PROJECT_ID=$OSDU_GCP_PROJECT,ENTITLEMENT_URL=$OSDU_GCP_ENTITLEMENTS_V2_URL,CRS_CATALOG_HOSTNAME=$OSDU_GCP_CRS_CATALOG_HOSTNAME,AUDIENCES=$GOOGLE_AUDIENCE
OSDU_GCP_INT_TEST_TYPE: python
OSDU_GCP_PYTHON_INT_TEST_SUBDIR: testing/catalog_test_gcp
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
......@@ -13,7 +12,7 @@ variables:
OSDU_GCP_HELM_CONFIG_SERVICE: crs-catalog-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: crs-catalog-deploy
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.project_id=$OSDU_GCP_PROJECT --set data.audiences=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-crs-catalog"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
# --- end of osdu-gcp specific variables ---
AWS_BUILD_SUBDIR: provider/crs-catalog-aws/build-aws
......
This diff is collapsed.
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