Gc merge properties

(cherry picked from commit 2cd804c1)

NOTICE

@@ -168,6 +168,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/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)

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

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 }}"

devops/gc/deploy/values.yaml

 global:
   domain: ""
-  useHttps: true
   limitsEnabled: true
   dataPartitionId: ""
   logLevel: "ERROR"

provider/partition-gc/src/main/resources/application-gcp.properties

-#
-# 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}

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}