From 683dbc5723511c1d50dbb17b619f046a097ebb6f Mon Sep 17 00:00:00 2001
From: "Ihor Anikeiev [EPAM / GCP]" <ihor_anikeiev@epam.com>
Date: Fri, 13 Dec 2024 14:37:29 +0000
Subject: [PATCH] Remove BM values and fix application properties
---
devops/gc/deploy/templates/configmap.yaml | 1 -
.../src/main/resources/application-gcp.properties | 6 ------
.../register-gc/src/main/resources/application.properties | 5 +++++
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index 4bcaa904c..f46ba2b30 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 929a1211e..e69de29bb 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 8cff2ef78..a5e224e38 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}
--
GitLab