Merge branch 'crs_catalog_tf' into 'master'

Update: Helm to TF for crs-catalog

See merge request !1679

helm/osdu-gc-baremetal/Chart.yaml

@@ -83,11 +83,6 @@ dependencies:
     repository: oci://community.opengroup.org:5555/osdu/platform/deployment-and-operations/config-service/gc-helm
     condition: gc_config_deploy.enabled
     alias: gc_config_deploy
-  ## CRS-Catalog
-  - name: gc-crs-catalog-deploy
-    version: 0.0.7-latest
-    repository: oci://community.opengroup.org:5555/osdu/platform/system/reference/crs-catalog-service/gc-helm
-    condition: gc-crs-catalog-deploy.enabled
   ## CRS-Conversion
   - name: gc-crs-conversion-deploy
     version: 0.0.7-latest

helm/osdu-gc-baremetal/values.yaml

@@ -364,14 +364,6 @@ gc_config_deploy:
   enabled: true
 # --- End of Config values --- #
 
-# --- Crs-catalog values --- #
-gc-crs-catalog-deploy:
-  enabled: true
-  data:
-    serviceAccountName: "crs-catalog"
-
-# --- End of Crs-catalog values --- #
-
 # --- Dataset values --- #
 gc_dataset_deploy:
   enabled: true

modules/osdu_k8s/files/templates/values.tpl

@@ -92,14 +92,6 @@ gc_entitlements_deploy:
     airflowComposerEmail: ${airflow_sa}
 # --- End of Entitlements values --- #
 
-# --- Crs-catalog values --- #
-gc-crs-catalog-deploy:
-  enabled: ${crs_catalog_enabled}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Crs-catalog values --- #
-
 # --- Dataset values --- #
 gc_dataset_deploy:
   enabled: true

modules/osdu_k8s/helm_crs-catalog.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 "helm_release" "crs-catalog" {
+  count = var.crs_catalog_enabled ? 1 : 0
+  name            = "crs-catalog"
+  repository      = "oci://${var.repository}/osdu/platform/system/reference/crs-catalog-service/gc-helm"
+  chart           = "gc-crs-catalog-deploy"
+  version         = var.crs-catalog_svc_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 300
+  upgrade_install = var.upgrade
+
+  set {
+    name  = "global.domain"
+    value = var.ingress_domain
+  }
+  set {
+    name  = "global.tier"
+    value = var.tier
+  }
+  set {
+    name  = "global.autoscaling"
+    value = var.autoscaling
+  }
+  set {
+    name  = "data.serviceAccountName"
+    value = var.crs-catalog_sa
+  }
+  set {
+    name  = "conf.replicas"
+    value = local.service_replicas
+  }
+  set {
+    name  = "conf.logLevel"
+    value = local.log_level
+  }
+}

modules/osdu_k8s/inputs.tf

@@ -186,6 +186,12 @@ variable "infra_bootstrap_sa" {
   default     = ""
 }
 
+variable "crs-catalog_sa" {
+  description = "Service  SA name"
+  type        = string
+  default     = "crs-catalog"
+}
+
 variable "postgresql_password" {
   description = "Password for database"
   type        = string

modules/osdu_k8s/inputs_versions.tf

@@ -57,3 +57,8 @@ variable "schema_svc_version" {
   type        = string
   default     = "0.0.7-latest"
 }
+variable "crs-catalog_svc_version" {
+  description = "Version of the crs-catalog service"
+  type        = string
+  default     = "0.0.7-latest"
+}

modules/osdu_k8s/values-tpl.tf

@@ -65,7 +65,6 @@ resource "local_file" "helm_values" {
     data_partition     = var.data_partition_name
     # non-core services
     crs_conversion_enabled     = var.crs_conversion_enabled
-    crs_catalog_enabled        = var.crs_catalog_enabled
     config_enabled             = var.config_enabled
     unit_enabled               = var.unit_enabled
     well_delivery_enabled      = var.well_delivery_enabled