Merge branch 'GONRG-10520-postgresql-google' into 'master'

Gonrg 10520 postgresql google

See merge request !1663

modules/osdu_k8s/files/templates/postgresql-bootstrap-values.tpl

+#  Copyright 2024 Google LLC
+#  Copyright 2024 EPAM
+#
+#  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
+#
+#      http://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
+
+global:
+  dataPartitionId: "${data_partition}"
+
+data:
+  serviceAccountName: "${infra_bootstrap_sa}"
+
+postgresql:
+  cloudSqlConnection: "${sql_connection_string}"

modules/osdu_k8s/files/templates/values.tpl

@@ -37,10 +37,6 @@ rabbitmq:
 
 postgresql:
   enabled: false
-  global:
-    postgresql:
-      auth:
-        postgresPassword: ${postgres_password}
 
 elasticsearch:
   enabled: ${elastic_enabled}
@@ -56,12 +52,9 @@ rabbitmq_bootstrap:
   enabled: false
 
 gc_baremetal_infra_bootstrap:
-  enabled: true
-  data:
-    serviceAccountName: ${infra_bootstrap_sa}
+  enabled: false
   postgresql:
-    external: true
-    cloudSqlConnection: ${sql_connection_string}
+    enabled: false
   keycloak:
     enabled: false
   minio:

modules/osdu_k8s/inputs_versions.tf

@@ -45,6 +45,12 @@ variable "osdu_gc_helm_version" {
   default     = "0.0.7-latest"
 }
 
+variable "gc_postgresql_bootstrap_chart_version" {
+  description = "PostgreSQL Bootstrap Helm Chart version"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
 # Services versions
 variable "config_svc_version" {
   description = "Version of the crs-catalog service"
@@ -165,4 +171,3 @@ variable "workflow_version" {
   type        = string
   default     = "0.0.7-latest"
 }
-

modules/osdu_k8s/postgresql_bootstrap.tf

+/**
+*  Copyright 2024 Google LLC
+*  Copyright 2024 EPAM
+*
+*  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
+*
+*      http://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.
+*/
+resource "local_file" "postgresql_bootstrap_helm_values" {
+  content = templatefile("${path.module}/files/templates/postgresql-bootstrap-values.tpl", {
+    data_partition        = var.data_partition_name
+    infra_bootstrap_sa    = var.infra_bootstrap_sa
+    sql_connection_string = var.sql_connection_name
+  })
+
+  filename = "./files/postgresql-bootstrap-custom-values.yaml"
+}
+
+resource "helm_release" "postgresql_bootstrap" {
+  depends_on = [
+    local_file.postgresql_bootstrap_helm_values,
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+  ]
+  name          = "postgresql-bootstrap"
+  repository    = "oci://${var.repository}/osdu/platform/deployment-and-operations/base-containers-gcp/postgresql-bootstrap-for-google-cloud/gc-helm"
+  chart         = "postgresql-gc-bootstrap"
+  version       = var.gc_postgresql_bootstrap_chart_version
+  namespace     = var.services_namespace
+  recreate_pods = true
+  timeout       = 2400
+
+  values = [
+    local_file.postgresql_bootstrap_helm_values.content
+  ]
+
+}