Merge branch 'GONRG-10527-STORAGE' into 'master'

Add deploy of storage service

See merge request !1692

helm/osdu-gc-baremetal/Chart.yaml

@@ -137,12 +137,30 @@ dependencies:
     repository: oci://community.opengroup.org:5555/osdu/platform/system/search-service/gc-helm
     condition: gc_search_deploy.enabled
     alias: gc_search_deploy
-  ## Storage
-  - name: gc-storage-deploy
-    version: 0.0.7-latest
-    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
+    repository: oci://community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services/gc-helm
+    condition: gc_wellbore_deploy.enabled
+    alias: gc_wellbore_deploy
+  ## Wellbore Worker
+  - name: gc-wellbore-worker-deploy
+    version: 0.0.7-latest
+    repository: oci://community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services-worker/gc-helm
+    condition: gc_wellbore_worker_deploy.enabled
+    alias: gc_wellbore_worker_deploy
+  ## Well Delivery
+  - name: gc-well-delivery-deploy
+    version: 0.0.7-latest
+    repository: oci://community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/well-delivery/well-delivery/gc-helm
+    condition: gc_well_delivery_deploy.enabled
+    alias: gc_well_delivery_deploy
   ## Seismic services
   # sdms
   - name: gc-seismic-store-deploy

helm/osdu-gc-baremetal/values.yaml

@@ -372,14 +372,10 @@ gc_policy_deploy:
     bootstrapServiceAccountName: "bootstrap-sa"
 # --- End of Policy values --- #
 
-# --- Storage values --- #
-gc_storage_deploy:
+# --- Unit values --- #
+gc_unit_deploy:
   enabled: true
-  data:
-    bootstrapServiceAccountName: "bootstrap-sa"
-    # FIXME: remove before M25 release (branch release/0.28)
-    opaEnabled: true
-# --- End of Storage values --- #
+# --- End of Unit values --- #
 
 # --- Register values --- #
 gc_register_deploy:

modules/osdu_k8s/files/templates/values.tpl

@@ -104,17 +104,13 @@ gc_config_deploy:
     logLevel: ${log_level}
 # --- End of Config values --- #
 
-# --- Storage values --- #
-gc_storage_deploy:
-  data:
-    storageServiceAccountEmail: ${storage_sa_email}
-    bootstrapServiceAccountName: ${bootstrap_sa} # no default
-    # FIXME: remove before M25 release (branch release/0.28)
-    opaEnabled: ${policy_enabled}
+# --- Unit values --- #
+gc_unit_deploy:
+  enabled: ${unit_enabled}
   conf:
-    replicas: ${storage_replicas}
+    replicas: ${replicas}
     logLevel: ${log_level}
-# --- End of Storage values --- #
+# --- End of Unit values --- #
 
 # --- Register values --- #
 gc_register_deploy:

modules/osdu_k8s/helm_storage.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" "storage" {
+
+  name            = "storage"
+  repository      = "oci://${var.repository}/osdu/platform/system/storage/gc-helm"
+  chart           = "gc-storage-deploy"
+  version         = var.storage_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 1800
+  upgrade_install = var.upgrade
+
+
+  # FIXME: Update depends_on when all services are ready
+  depends_on = [
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+    helm_release.osdu_gc,
+  ]
+
+  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.storageServiceAccountEmail"
+    value = var.storage_sa_email
+  }
+  set {
+    name = "data.bootstrapServiceAccountName"
+    value = var.bootstrap_sa
+  }
+  set {
+    name = "data.opaEnabled"
+    value = var.policy_enabled
+  }
+  set {
+    name  = "conf.replicas"
+    value = local.storage_replicas
+  }
+  set {
+    name  = "conf.logLevel"
+    value = local.log_level
+  }
+}

modules/osdu_k8s/inputs_versions.tf

@@ -89,6 +89,12 @@ variable "schema_svc_version" {
   default     = "0.0.7-latest"
 }
 
+variable "storage_version" {
+  description = "Version of the storage service"
+  type = string
+  default = "0.0.7-latest"
+}
+
 variable "unit_svc_version" {
   description = "Version of the unit service"
   type        = string

modules/osdu_k8s/values-tpl.tf

@@ -52,8 +52,6 @@ resource "local_file" "helm_values" {
     policy_bucket       = "${var.project_id}-opa-policies"
     opa_image           = local.opa_image
     policy_bootstrap_sa = var.policy_bootstrap_sa
-    # storage
-    storage_sa_email = var.storage_sa_email
     # register
     register_pubsub_endpoint = "https://${var.ingress_domain}/api/notification/v1/push-handlers/records-changed"
     # workflow