Commit efe93a7a authored by Vladislav Shishko (EPAM)'s avatar Vladislav Shishko (EPAM)
Browse files

Update devops/gcp/configmap/values.yaml,...

Update devops/gcp/configmap/values.yaml, devops/gcp/configmap/templates/wellbore-variables.yml, .gitlab-ci.yml files
parent bb063e20
Pipeline #69998 failed with stages
in 52 seconds
...@@ -32,7 +32,7 @@ variables: ...@@ -32,7 +32,7 @@ variables:
OSDU_GCP_SERVICE: wellbore OSDU_GCP_SERVICE: wellbore
OSDU_GCP_VENDOR: gcp OSDU_GCP_VENDOR: gcp
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_VARS: "--set data.os_wellbore_ddms_data_project_id=$OSDU_GCP_PROJECT --set data.service_host_search=$OSDU_GCP_SERVICE_HOST_SEARCH --set data.sa_key=$OSDU_GCP_INTEGRATION_TESTER" OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.os_wellbore_ddms_data_project_id=$OSDU_GCP_PROJECT"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-wellbore" OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-wellbore"
OSDU_GCP_HELM_CONFIG_SERVICE: wellbore-config OSDU_GCP_HELM_CONFIG_SERVICE: wellbore-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: wellbore-deploy OSDU_GCP_HELM_DEPLOYMENT_SERVICE: wellbore-deploy
......
...@@ -8,6 +8,4 @@ metadata: ...@@ -8,6 +8,4 @@ metadata:
data: data:
CLOUD_PROVIDER: "gcp" CLOUD_PROVIDER: "gcp"
OS_WELLBORE_DDMS_DATA_PROJECT_ID: "{{ .Values.data.os_wellbore_ddms_data_project_id }}" OS_WELLBORE_DDMS_DATA_PROJECT_ID: "{{ .Values.data.os_wellbore_ddms_data_project_id }}"
SERVICE_HOST_SEARCH: "{{ .Values.data.service_host_search }}"
SERVICE_HOST_STORAGE: "{{ .Values.data.service_host_storage }}"
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
data: data:
os_wellbore_ddms_data_project_id: "" os_wellbore_ddms_data_project_id: ""
service_host_search: "http://search/api/search"
service_host_storage: "http://storage/api/storage"
conf: conf:
configmap: "wellbore-config" configmap: "wellbore-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