Commit d0d44cac authored by Aliaksandr Lubouski (EPAM)'s avatar Aliaksandr Lubouski (EPAM) 🥑
Browse files

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

GONRG-3576: added variables for das integration

See merge request !173
parents a806b86f 975ee94e
Pipeline #71114 canceled with stages
in 35 minutes and 47 seconds
...@@ -8,7 +8,7 @@ variables: ...@@ -8,7 +8,7 @@ variables:
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
OSDU_GCP_HELM_CONFIG_SERVICE: workflow-config OSDU_GCP_HELM_CONFIG_SERVICE: workflow-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: workflow-deploy 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" 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 --- # --- end of osdu gcp specific variables ---
......
...@@ -13,4 +13,6 @@ data: ...@@ -13,4 +13,6 @@ data:
OSDU_ENTITLEMENTS_APPKEY: "{{ .Values.data.osdu_entitlements_appkey}}" OSDU_ENTITLEMENTS_APPKEY: "{{ .Values.data.osdu_entitlements_appkey}}"
GCP_AIRFLOW_URL: "{{ .Values.data.gcp_airflow_url }}" GCP_AIRFLOW_URL: "{{ .Values.data.gcp_airflow_url }}"
OSDU_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 }}"
...@@ -9,6 +9,8 @@ data: ...@@ -9,6 +9,8 @@ data:
osdu_entitlements_url: "http://entitlements/api/entitlements/v2/" osdu_entitlements_url: "http://entitlements/api/entitlements/v2/"
osdu_entitlements_appkey: "" osdu_entitlements_appkey: ""
gcp_airflow_url: "" gcp_airflow_url: ""
workflow_admin_account: ""
shared_tenant_name: ""
conf: conf:
configmap: "workflow-config" configmap: "workflow-config"
......
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