Merge branch 'GONRG-10526' into 'master'

[GONRG-10526] Add deploy of workflow service

See merge request !1662

helm/osdu-gc-baremetal/Chart.yaml

@@ -173,12 +173,6 @@ dependencies:
     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
-  ## Workflow
-  - name: gc-workflow-deploy
-    version: 0.0.7-latest
-    repository: oci://community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/gc-helm
-    condition: gc_workflow_deploy.enabled
-    alias: gc_workflow_deploy
   ## Seismic services
   # sdms
   - name: gc-seismic-store-deploy

helm/osdu-gc-baremetal/values.yaml

@@ -416,14 +416,6 @@ gc_well_delivery_deploy:
   enabled: true
 # --- Well Delivery values --- #
 
-# --- Workflow values --- #
-gc_workflow_deploy:
-  enabled: true
-  data:
-    sharedTenantName: "osdu"
-    bootstrapServiceAccountName: "bootstrap-sa"
-# --- End of Workflow values --- #
-
 # --- File values --- #
 gc_file_deploy:
   enabled: true

modules/osdu_k8s/files/templates/values.tpl

@@ -165,18 +165,6 @@ gc_well_delivery_deploy:
     logLevel: ${log_level}
 # --- Well Delivery values --- #
 
-# --- Workflow values --- #
-gc_workflow_deploy:
-  enabled: ${workflow_enabled}
-  data:
-    bootstrapServiceAccountName: ${bootstrap_sa} # no default
-    osduAirflowUrl: ${airflow_url}
-    composerClient: ${composer_client}
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Workflow values --- #
-
 # --- File values --- #
 gc_file_deploy:
   conf:

modules/osdu_k8s/helm_crs-catalog.tf

@@ -17,6 +17,12 @@
 
 resource "helm_release" "crs-catalog" {
   count = var.crs_catalog_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            = "crs-catalog"
   repository      = "oci://${var.repository}/osdu/platform/system/reference/crs-catalog-service/gc-helm"
   chart           = "gc-crs-catalog-deploy"

modules/osdu_k8s/helm_crs-conversion.tf

@@ -18,6 +18,12 @@
 
 resource "helm_release" "crs-conversion" {
   count = var.crs_conversion_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            = "crs-conversion"
   repository      = "oci://${var.repository}/osdu/platform/system/reference/crs-conversion-service/gc-helm"
   chart           = "gc-crs-conversion-deploy"

modules/osdu_k8s/helm_workflow.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" "workflow" {
+  # FIXME: Update depends_on when all services are ready
+  depends_on = [
+    helm_release.gc_secrets,
+    helm_release.k8s-resources,
+    helm_release.osdu_gc,
+  ]
+  name          = "workflow"
+  repository    = "oci://${var.repository}/osdu/platform/data-flow/ingestion/ingestion-workflow/gc-helm"
+  chart         = "gc-workflow-deploy"
+  version       = var.workflow_version
+  namespace     = var.services_namespace
+  recreate_pods = true
+  timeout       = 300
+
+  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.bootstrapServiceAccountName"
+    value = var.bootstrap_sa
+  }
+  set {
+    name  = "data.osduAirflowUrl"
+    value = var.airflow_url
+  }
+
+  set {
+    name  = "conf.replicas"
+    value = local.service_replicas
+  }
+  set {
+    name  = "conf.logLevel"
+    value = local.log_level
+  }
+}

modules/osdu_k8s/inputs_versions.tf

@@ -46,8 +46,9 @@ variable "gc_composer_bootstrap_chart_version" {
 }
 
 # Services versions
-variable "partition_version" {
-  description = "Version of the partition service"
+
+variable "crs-catalog_svc_version" {
+  description = "Version of the crs-catalog service"
   type        = string
   default     = "0.0.7-latest"
 }
@@ -58,13 +59,20 @@ variable "crs-conversation_svc_version" {
   default     = "0.0.7-latest"
 }
 
+variable "partition_version" {
+  description = "Version of the partition service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
 variable "schema_svc_version" {
   description = "Version of the scema service"
   type        = string
   default     = "0.0.7-latest"
 }
-variable "crs-catalog_svc_version" {
-  description = "Version of the crs-catalog service"
+
+variable "workflow_version" {
+  description = "Version of the workflow service"
   type        = string
   default     = "0.0.7-latest"
 }

modules/osdu_k8s/osdu_gc_helm.tf

@@ -15,10 +15,12 @@
 *  limitations under the License.
 */
 
+# FIXME: Must be deleted when all services are ready
 resource "helm_release" "osdu_gc" {
   depends_on = [
     helm_release.gc_secrets,
     helm_release.k8s-resources,
+    helm_release.partition,
   ]
 
   name          = "osdu-gc"