Merge branch 'tf-well-delivery' into 'master'

Update: tf for well delivery

See merge request !1702

helm/osdu-gc-baremetal/Chart.yaml

@@ -149,24 +149,6 @@ dependencies:
     repository: oci://community.opengroup.org:5555/osdu/platform/system/storage/gc-helm
     condition: gc_storage_deploy.enabled
     alias: gc_storage_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

@@ -406,11 +406,6 @@ gc_notification_deploy:
   enabled: true
 # --- End of Notification values --- #
 
-# --- Well Delivery values --- #
-gc_well_delivery_deploy:
-  enabled: true
-# --- Well Delivery values --- #
-
 # --- File values --- #
 gc_file_deploy:
   enabled: true
@@ -454,16 +449,6 @@ core_legal_deploy:
     cronJobServiceAccountName: "bootstrap-sa"
 # --- End of Legal values --- #
 
-# --- Wellbore values --- #
-gc_wellbore_deploy:
-  enabled: true
-# --- End of Wellbore values --- #
-
-# --- Wellbore Worker values --- #
-gc_wellbore_worker_deploy:
-  enabled: true
-# --- End of Wellbore Worker values --- #
-
 # --- Secret service values --- #
 gc_secret_deploy:
   enabled: true

modules/osdu_k8s/files/templates/values.tpl

@@ -147,16 +147,6 @@ gc_notification_deploy:
     logLevel: ${log_level}
 # --- End of Notification values --- #
 
-# --- Well Delivery values --- #
-gc_well_delivery_deploy:
-  enabled: ${well_delivery_enabled}
-  data:
-    sqlConnectionString: ${sql_connection_string}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- Well Delivery values --- #
-
 # --- File values --- #
 gc_file_deploy:
   conf:
@@ -202,22 +192,6 @@ core_legal_deploy:
   enabled: false
 # --- End of Legal values --- #
 
-# --- Wellbore values --- #
-gc_wellbore_deploy:
-  enabled: ${wellbore_enabled}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Wellbore values --- #
-
-# --- Wellbore Worker values --- #
-gc_wellbore_worker_deploy:
-  enabled: ${wellbore_worker_enabled}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Wellbore Worker values --- #
-
 # --- Secret service values --- #
 gc_secret_deploy:
   enabled: ${secret_enabled}

modules/osdu_k8s/helm_eds.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" "eds" {
+  count = var.eds_enabled ? 1 : 0
+  # FIXME: Update depends_on when all services are ready
+  depends_on = [
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+    helm_release.osdu_gc
+  ]
+  name            = "eds"
+  repository      = "oci://${var.repository}/osdu/platform/data-flow/ingestion/external-data-sources/eds-dms/gc-helm"
+  chart           = "gc-eds-dms-deploy"
+  version         = var.eds_svc_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 1800
+  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/helm_well-delivery.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" "well-delivery" {
+  count = var.well_delivery_enabled ? 1 : 0
+  # FIXME: Update depends_on when all services are ready
+  depends_on = [
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+    helm_release.osdu_gc
+  ]
+  name            = "well-delivery"
+  repository      = "oci://${var.repository}/osdu/platform/domain-data-mgmt-services/well-delivery/well-delivery/gc-helm"
+  chart           = "gc-well-delivery-deploy"
+  version         = var.well-delivery_svc_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 1800
+  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.sqlConnectionString"
+    value = var.sql_connection_name
+  }
+  set {
+    name  = "conf.replicas"
+    value = local.service_replicas
+  }
+  set {
+    name  = "conf.logLevel"
+    value = local.log_level
+  }
+}

modules/osdu_k8s/helm_wellbore-worker.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" "wellbore-worker" {
+  count = var.wellbore_worker_enabled ? 1 : 0
+  # FIXME: Update depends_on when all services are ready
+  depends_on = [
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+    helm_release.osdu_gc,
+    
+  ]
+  name            = "wellbore-worker"
+  repository      = "oci://${var.repository}/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services-worker/gc-helm"
+  chart           = "gc-wellbore-worker-deploy"
+  version         = var.wellbore-worker_svc_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 1800
+  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/helm_wellbore.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" "wellbore" {
+  count = var.wellbore_enabled ? 1 : 0
+   # FIXME: Update depends_on when all services are ready
+  depends_on = [
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+     helm_release.osdu_gc,
+    
+  ]
+  name            = "wellbore"
+  repository      = "oci://${var.repository}/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services/gc-helm"
+  chart           = "gc-wellbore-deploy"
+  version         = var.wellbore_svc_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 1800
+  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

@@ -9,7 +9,7 @@
 *      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,
+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.
@@ -59,6 +59,12 @@ variable "crs-conversation_svc_version" {
   default     = "0.0.7-latest"
 }
 
+variable "eds_svc_version" {
+  description = "Version of the eds service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
 variable "partition_svc_version" {
   description = "Version of the partition service"
   type        = string
@@ -77,6 +83,24 @@ variable "unit_svc_version" {
   default     = "0.0.7-latest"
 }
 
+variable "well-delivery_svc_version" {
+  description = "Version of the well-delivery service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
+variable "wellbore-worker_svc_version" {
+  description = "Version of the wellbore-worker service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
+variable "wellbore_svc_version" {
+  description = "Version of the wellbore service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
 variable "workflow_version" {
   description = "Version of the workflow service"
   type        = string

modules/osdu_k8s/values-tpl.tf

@@ -65,11 +65,8 @@ resource "local_file" "helm_values" {
     data_partition     = var.data_partition_name
     # non-core services
     config_enabled             = var.config_enabled
-    well_delivery_enabled      = var.well_delivery_enabled
     workflow_enabled           = var.workflow_enabled
     seismic_store_sdms_enabled = var.seismic_store_sdms_enabled
-    wellbore_enabled           = var.wellbore_enabled
-    wellbore_worker_enabled    = var.wellbore_worker_enabled
     secret_enabled             = var.secret_enabled
     oetp_client_enabled        = var.oetp_client_enabled
     oetp_server_enabled        = var.oetp_server_enabled