Merge branch 'tf-crs-converter' into 'master'

Update: helm-tf for crs-converter

See merge request !1681

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-Conversion
-  - name: gc-crs-conversion-deploy
-    version: 0.0.7-latest
-    repository: oci://community.opengroup.org:5555/osdu/platform/system/reference/crs-conversion-service/gc-helm
-    condition: gc-crs-conversion-deploy.enabled
   ## Dataset
   - name: gc-dataset-deploy
     version: 0.0.7-latest

helm/osdu-gc-baremetal/values.yaml

@@ -373,11 +373,6 @@ gc_dataset_deploy:
     postgresSecretName: "dataset-postgres-secret"
 # --- End of Dataset values --- #
 
-# --- Crs-conversion values --- #
-gc-crs-conversion-deploy:
-  enabled: true
-# --- End of Crs-conversion values --- #
-
 # --- Policy values --- #
 gc_policy_deploy:
   enabled: true

modules/osdu_k8s/files/templates/values.tpl

@@ -100,14 +100,6 @@ gc_dataset_deploy:
     logLevel: ${log_level}
 # --- End of Dataset values --- #
 
-# --- Crs-conversion values --- #
-gc-crs-conversion-deploy:
-  enabled: ${crs_conversion_enabled}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Crs-conversion values --- #
-
 # --- Policy values --- #
 gc_policy_deploy:
   data:

modules/osdu_k8s/helm_crs-conversion.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-conversion" {
+  count = var.crs_conversion_enabled ? 1 : 0
+  name            = "crs-conversion"
+  repository      = "oci://${var.repository}/osdu/platform/system/reference/crs-conversion-service/gc-helm"
+  chart           = "gc-crs-conversion-deploy"
+  version         = var.crs-conversation_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  = "conf.replicas"
+    value = local.service_replicas
+  }
+  set {
+    name  = "conf.logLevel"
+    value = local.log_level
+  }
+}

modules/osdu_k8s/inputs_versions.tf

@@ -52,6 +52,12 @@ variable "partition_version" {
   default     = "0.0.7-latest"
 }
 
+variable "crs-conversation_svc_version" {
+  description = "Version of the crs-conversation service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
 variable "schema_svc_version" {
   description = "Version of the scema service"
   type        = string

modules/osdu_k8s/values-tpl.tf

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