From 2cd804c1a651c24176ef55eb9a2778143b06e25e Mon Sep 17 00:00:00 2001
From: "Aliaksandr Ramanovich (EPAM)" <aliaksandr_ramanovich1@epam.com>
Date: Fri, 28 Feb 2025 19:19:12 +0000
Subject: [PATCH] Gc merge properties
---
NOTICE | 2 +-
devops/gc/deploy/README.md | 1 -
devops/gc/deploy/templates/configmap.yaml | 2 --
devops/gc/deploy/values.yaml | 1 -
.../main/resources/application-gcp.properties | 19 -------------------
.../src/main/resources/application.properties | 1 +
6 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 provider/partition-gc/src/main/resources/application-gcp.properties
diff --git a/NOTICE b/NOTICE
index 9e2f9d5fa..b29a560d8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -211,7 +211,7 @@ The following software have components provided under the terms of this license:
- Redisson (from http://redisson.org, https://redisson.pro)
- Retrofit (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
- RxJava (from https://github.com/ReactiveX/RxJava)
-- Smithy :: Dafny :: Conversion (from https://github.com/awslabs/smithy)
+- Smithy :: Dafny :: Conversion (from https://github.com/smithy-lang/smithy)
- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml)
- Spring AOP (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-aop)
- Spring Beans (from http://www.springframework.org, https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-beans)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index dc2894aaf..08fffbc97 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -97,7 +97,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**global.domain** | your domain | string | - | yes
-**global.useHttps** | defines whether to use HTTPS instead of HTTP for external minio s3 endpoint connection | boolean | `true` | yes
**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes
**global.dataPartitionId** | data partition id | string | - | yes
**global.logLevel** | severity of logging level | string | `ERROR` | yes
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index 02af7b867..d3ba26458 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -19,6 +19,4 @@ data:
SYSTEM_TENANT_API: "true"
GOOGLE_CLOUD_PROJECT: {{ .Values.data.projectId | quote }}
PARTITION_NAMESPACE: {{ .Values.data.partitionNamespace | quote }}
- SYSTEM_PARTITION_ID: "system"
- SPRING_PROFILES_ACTIVE: "gcp"
DATABASE_ID: "{{ $databaseId }}"
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 55c91e212..56a60c125 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -1,6 +1,5 @@
global:
domain: ""
- useHttps: true
limitsEnabled: true
dataPartitionId: ""
logLevel: "ERROR"
diff --git a/provider/partition-gc/src/main/resources/application-gcp.properties b/provider/partition-gc/src/main/resources/application-gcp.properties
deleted file mode 100644
index 6f21abf1f..000000000
--- a/provider/partition-gc/src/main/resources/application-gcp.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2020-2022 Google LLC
-# Copyright 2020-2022 EPAM Systems, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-environment=gcp
-google-cloud-project=${GOOGLE_CLOUD_PROJECT}
diff --git a/provider/partition-gc/src/main/resources/application.properties b/provider/partition-gc/src/main/resources/application.properties
index b871a5f06..e87358eb7 100644
--- a/provider/partition-gc/src/main/resources/application.properties
+++ b/provider/partition-gc/src/main/resources/application.properties
@@ -37,6 +37,7 @@ partition-property-kind=PartitionProperty
partition-namespace=partition
dataPartitionId = ${DATA_PARTITION_ID:test-partition}
environment=gcp
+google-cloud-project=${GOOGLE_CLOUD_PROJECT}
#System endpoint
system.tenant.api=${SYSTEM_TENANT_API:true}
--
GitLab