diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml index 4bcaa904c8e02e0f29014389f33b5bb48dd14b19..f46ba2b30dbe73e7c40fdabcd0092e28ddc4784b 100644 --- a/devops/gc/deploy/templates/configmap.yaml +++ b/devops/gc/deploy/templates/configmap.yaml @@ -15,7 +15,6 @@ data: STORAGE_HOST: {{ .Values.data.storageHost | quote }} SECRET_HOST: {{ .Values.data.secretHost | quote }} SERVICE_IDENTITY: {{ .Values.data.serviceIdentity | quote }} - SPRING_PROFILES_ACTIVE: "gcp" {{- if .Values.conf.intTestEndpoint }} TEST_ENDPOINT: "true" {{- end }} diff --git a/provider/register-gc/src/main/resources/application-gcp.properties b/provider/register-gc/src/main/resources/application-gcp.properties index 929a1211ebde0a2b45c3c355f94734dc359c26a2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/provider/register-gc/src/main/resources/application-gcp.properties +++ b/provider/register-gc/src/main/resources/application-gcp.properties @@ -1,6 +0,0 @@ -osmDriver=datastore -oqmDriver=pubsub -service.token.provider=GCP -partition-auth-enabled=true - -google-cloud-project=${GOOGLE_CLOUD_PROJECT} diff --git a/provider/register-gc/src/main/resources/application.properties b/provider/register-gc/src/main/resources/application.properties index 8cff2ef78cba981be055f33c46ef281f9ed3ff3b..a5e224e386f4e7dbc90110558bac845b16a1930f 100644 --- a/provider/register-gc/src/main/resources/application.properties +++ b/provider/register-gc/src/main/resources/application.properties @@ -53,3 +53,8 @@ management.server.port=${MANAGEMENT_SERVER_PORT:8081} management.endpoints.web.base-path=${MANAGEMENT_ENDPOINTS_WEB_BASE:/} management.endpoints.web.exposure.include=health management.health.probes.enabled=true + +# GCP specific properties +service.token.provider=GCP +partition-auth-enabled=true +google-cloud-project=${GOOGLE_CLOUD_PROJECT}