Commit f11764e5 authored by Arturo Hernandez [EPAM]'s avatar Arturo Hernandez [EPAM]
Browse files

Merge remote-tracking branch 'epam/master' into epam-msft-contribution

parents 0f9ff086 096d1742
Pipeline #120297 failed with stages
in 30 minutes and 40 seconds
...@@ -121,14 +121,6 @@ configuration: ...@@ -121,14 +121,6 @@ configuration:
value: "200" value: "200"
- name: SPRING_CONFIG_NAME - name: SPRING_CONFIG_NAME
value: "common,application" value: "common,application"
- name: KEY_VAULT_URL
config:
name: osdu-svc-config
key: ENV_KEYVAULT
- name: REDIS_DATABASE
config:
name: osdu-svc-config
key: REDIS_DB_DELIVERY
- name: aad_client_id - name: aad_client_id
secret: secret:
name: active-directory name: active-directory
...@@ -139,5 +131,17 @@ configuration: ...@@ -139,5 +131,17 @@ configuration:
key: appinsights key: appinsights
- name: azure_istio_auth_enabled - name: azure_istio_auth_enabled
value: "true" value: "true"
# osdu-svc-properties for pipeline and glab install
# osdu-svc-config for helm chart in az devops
- name: KEY_VAULT_URL
config:
name: osdu-svc-properties
key: ENV_KEYVAULT
# For REDIS_DB_EDS Reusing value 12 as it is not used yet for other services
- name: REDIS_DATABASE
value: "12"
# config:
# name: osdu-svc-config
# key: REDIS_DB_DELIVERY
#istioDnsHost: "contoso.com" #istioDnsHost: "contoso.com"
\ No newline at end of file
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