Merge branch 'feature/GONRG-3576' into 'master'

GONRG-3576: added variables for das integration

See merge request !173

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
   OSDU_GCP_HELM_CONFIG_SERVICE: workflow-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: workflow-deploy
-  OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.google_audiences=$GOOGLE_AUDIENCE --set data.osdu_entitlements_appkey=workflow-service --set data.gcp_airflow_url=$OSDU_GCP_AIRFLOW_URL --set data.osdu_airflow_url=$OSDU_GCP_AIRFLOW_URL"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.google_audiences=$GOOGLE_AUDIENCE --set data.osdu_entitlements_appkey=workflow-service --set data.gcp_airflow_url=$OSDU_GCP_AIRFLOW_URL --set data.osdu_airflow_url=$OSDU_GCP_AIRFLOW_URL --set data.workflow_admin_account=$OSDU_GCP_WORKFLOW_ADMIN_ACCOUNT --set data.shared_tenant_name=$TENANT_NAME"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-workflow"
 
   # --- end of osdu gcp specific variables ---

devops/gcp/configmap/templates/workflow-variables.yml

@@ -13,4 +13,6 @@ data:
   OSDU_ENTITLEMENTS_APPKEY: "{{ .Values.data.osdu_entitlements_appkey}}"
   GCP_AIRFLOW_URL: "{{ .Values.data.gcp_airflow_url }}"
   OSDU_AIRFLOW_URL: "{{ .Values.data.gcp_airflow_url }}"
+  WORKFLOW_ADMIN_ACCOUNT: "{{ .Values.data.workflow_admin_account }}"
+  SHARED_TENENT_NAME: "{{ .Values.var.data_partition_id }}"
 

devops/gcp/configmap/values.yaml

@@ -9,6 +9,8 @@ data:
   osdu_entitlements_url: "http://entitlements/api/entitlements/v2/"
   osdu_entitlements_appkey: ""
   gcp_airflow_url: ""
+  workflow_admin_account: ""
+  shared_tenant_name: ""
 
 conf:
   configmap: "workflow-config"