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

Update devops/gcp/configmap/templates/wellbore-variables.yml,...

Update devops/gcp/configmap/templates/wellbore-variables.yml, devops/gcp/configmap/values.yaml, devops/gcp/deploy/templates/deployment.yaml, devops/gcp/deploy/values.yaml, .gitignore, .gitlab-ci.yml files
Deleted devops/gcp/configmap/templates/wellbore-secret.yaml
parent 1b47927b
Pipeline #69928 failed with stages
in 5 minutes and 38 seconds
......@@ -41,4 +41,4 @@ secrets/
**/.DS_Store
.vscode
\ No newline at end of file
.vscode
......@@ -33,7 +33,7 @@ variables:
OSDU_GCP_VENDOR: gcp
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_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA"
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_DEPLOYMENT_SERVICE: wellbore-deploy
OSDU_GCP_INT_TEST_TYPE: python
......
kind: Secret
apiVersion: v1
metadata:
name: "{{ .Values.conf.secret_name }}"
namespace: "{{ .Release.Namespace }}"
type: Opaque
data:
"key.json": "{{ .Values.data.sa_key }}"
......@@ -10,4 +10,4 @@ data:
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 }}"
OS_WELLBORE_DDMS_DATA_PROJECT_CREDENTIALS : "{{ .Values.data.os_wellbore_ddms_data_project_credentials }}"
......@@ -4,12 +4,10 @@
data:
os_wellbore_ddms_data_project_id: ""
os_wellbore_ddms_data_project_credentials: "/tmp/key/key.json"
service_host_search: "http://search/api/search"
service_host_storage: "http://storage/api/storage"
sa_key: ""
conf:
configmap: "wellbore-config"
app_name: "wellbore"
secret_name: "wellbore-secret"
......@@ -18,15 +18,9 @@ spec:
rollme: {{ randAlphaNum 5 | quote }}
sidecar.istio.io/rewriteAppHTTPProbers: "true"
spec:
volumes:
- name: service-account-key
secret:
secretName: "{{ .Values.conf.secret_name }}"
serviceAccountName: "{{ .Values.data.serviceAccountName }}"
containers:
- name: "{{ .Values.conf.app_name }}"
volumeMounts:
- mountPath: /tmp/key
name: service-account-key
image: "{{ .Values.data.image }}"
imagePullPolicy: Always
envFrom:
......
......@@ -8,8 +8,9 @@ data:
limits_cpu: "1"
limits_memory: "2G"
image: "community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services/osdu-gcp:latest"
serviceAccountName: ""
conf:
configmap: "wellbore-config"
app_name: "wellbore"
secret_name: "wellbore-secret"
Markdown is supported
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