Merge branch 'unit-tf' into 'master'

Unit in DF TF

See merge request !1670

helm/osdu-gc-baremetal/Chart.yaml

@@ -149,12 +149,6 @@ dependencies:
     repository: oci://community.opengroup.org:5555/osdu/platform/system/storage/gc-helm
     condition: gc_storage_deploy.enabled
     alias: gc_storage_deploy
-  ## Unit
-  - name: gc-unit-deploy
-    version: 0.0.7-latest
-    repository: oci://community.opengroup.org:5555/osdu/platform/system/reference/unit-service/gc-helm
-    condition: gc_unit_deploy.enabled
-    alias: gc_unit_deploy
   ## Wellbore
   - name: gc-wellbore-deploy
     version: 0.0.7-latest

helm/osdu-gc-baremetal/values.yaml

@@ -390,11 +390,6 @@ gc_storage_deploy:
     opaEnabled: true
 # --- End of Storage values --- #
 
-# --- Unit values --- #
-gc_unit_deploy:
-  enabled: true
-# --- End of Unit values --- #
-
 # --- Register values --- #
 gc_register_deploy:
   enabled: true

modules/osdu_k8s/files/templates/values.tpl

@@ -130,14 +130,6 @@ gc_storage_deploy:
     logLevel: ${log_level}
 # --- End of Storage values --- #
 
-# --- Unit values --- #
-gc_unit_deploy:
-  enabled: ${unit_enabled}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Unit values --- #
-
 # --- Register values --- #
 gc_register_deploy:
   data:

modules/osdu_k8s/helm_partition.tf

@@ -24,7 +24,7 @@ resource "helm_release" "partition" {
   name            = "partition"
   repository      = "oci://${var.repository}/osdu/platform/system/partition/gc-helm"
   chart           = "gc-partition-deploy"
-  version         = var.partition_version
+  version         = var.partition_svc_version
   namespace       = var.services_namespace
   recreate_pods   = true
   timeout         = 300

modules/osdu_k8s/helm_unit.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" "unit" {
+  count = var.unit_enabled ? 1 : 0
+  # FIXME: Update depends_on when entitlements will be separated
+  depends_on = [
+    helm_release.osdu_gc
+  ]
+
+  name            = "unit"
+  repository      = "oci://${var.repository}/osdu/platform/system/reference/unit-service/gc-helm"
+  chart           = "gc-unit-deploy"
+  version         = var.unit_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

@@ -59,14 +59,20 @@ variable "crs-conversation_svc_version" {
   default     = "0.0.7-latest"
 }
 
-variable "partition_version" {
+variable "partition_svc_version" {
   description = "Version of the partition service"
   type        = string
   default     = "0.0.7-latest"
 }
 
 variable "schema_svc_version" {
-  description = "Version of the scema service"
+  description = "Version of the schema service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
+variable "unit_svc_version" {
+  description = "Version of the unit 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
     config_enabled             = var.config_enabled
-    unit_enabled               = var.unit_enabled
     well_delivery_enabled      = var.well_delivery_enabled
     workflow_enabled           = var.workflow_enabled
     seismic_store_sdms_enabled = var.seismic_store_sdms_enabled