From df0b97a8c8fc91e827c90e8aaa923977fd7efa30 Mon Sep 17 00:00:00 2001
From: Danylo Vanin <danylo_vanin@epam.com>
Date: Fri, 23 Sep 2022 20:15:23 +0300
Subject: [PATCH 1/2] [GONRG-5702] Added workflow bootstrap

---
 .../simple_osdu_onprem/custom-release.yaml     |  1 +
 helm/osdu-infra-onprem/values.yaml             |  8 ++++----
 modules/osdu/helm-workflow.tf                  | 18 +++++++++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/examples/simple_osdu_onprem/custom-release.yaml b/examples/simple_osdu_onprem/custom-release.yaml
index 87c772aa..448b12d2 100755
--- a/examples/simple_osdu_onprem/custom-release.yaml
+++ b/examples/simple_osdu_onprem/custom-release.yaml
@@ -257,6 +257,7 @@ gcp_well_delivery_deploy:
 gcp_workflow_deploy:
   data:
     image: "gcr.io/osdu-anthos/workflow/osdu-gcp-workflow:v0.16.0"
+    # fixme Add bootstrap image
 
 gcp_file_deploy:
   data:
diff --git a/helm/osdu-infra-onprem/values.yaml b/helm/osdu-infra-onprem/values.yaml
index 5b741a8d..b69ccd7f 100644
--- a/helm/osdu-infra-onprem/values.yaml
+++ b/helm/osdu-infra-onprem/values.yaml
@@ -689,6 +689,7 @@ gcp_workflow_configmap:
   data:
     springProfilesActive: "anthos"
     sharedTenantName: "osdu"
+    dataPartitionId: "osdu"
   conf:
     onPremEnabled: true
 
@@ -696,12 +697,11 @@ gcp_workflow_deploy:
   enabled: true
   data:
     image: "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-workflow:latest"
+    bootstrapImage: "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-bootstrap-workflow:latest"
+    bootstrapServiceAccountName: "bootstrap-sa"
   conf:
-    workflowAirflowSecretName: "workflow-airflow-secret"
-    workflowPostgresSecretName: "workflow-postgres-secret"
-    rabbitmqSecretName: "rabbitmq-secret"
     onPremEnabled: true
-    domain: ""
+
 # --- End of Workflow values --- #
 
 # --- File values --- #
diff --git a/modules/osdu/helm-workflow.tf b/modules/osdu/helm-workflow.tf
index 49efa1e5..eba30356 100644
--- a/modules/osdu/helm-workflow.tf
+++ b/modules/osdu/helm-workflow.tf
@@ -1,6 +1,7 @@
 locals {
   workflow_name  = "workflow"
   workflow_image = "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-workflow"
+  workflow_bootstrap_image = "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-bootstrap-workflow"
   workflow_roles_name = [
     "roles/datastore.user",
     "roles/iam.serviceAccountTokenCreator",
@@ -36,12 +37,8 @@ resource "helm_release" "workflow-config" {
     value = var.log_level
   }
   set {
-    name  = "data.entitlementsHost"
-    value = "http://${local.ent_name}"
-  }
-  set {
-    name  = "data.partitionHost"
-    value = "http://${local.partition_name}"
+    name  = "data.dataPartitionId"
+    value = var.data_partition_id
   }
   set {
     name  = "data.googleAudiences"
@@ -79,7 +76,14 @@ resource "helm_release" "workflow-deploy" {
     name  = "data.serviceAccountName"
     value = module.workflow_workload_identity.service_account
   }
-
+  set {
+    name  = "data.bootstrapImage"
+    value = join(":", [local.workflow_bootstrap_image, local.workflow_tag])
+  }
+  set {
+    name  = "data.bootstrapServiceAccountName"
+    value = kubernetes_service_account.gke-bootstrap-sa.metadata[0].name
+  }
   set {
     name  = "conf.domain"
     value = var.ingress_domain
-- 
GitLab


From ea4765f3084040b2bbd58275e97df5750b5b432e Mon Sep 17 00:00:00 2001
From: Danylo Vanin <danylo_vanin@epam.com>
Date: Mon, 26 Sep 2022 18:28:35 +0300
Subject: [PATCH 2/2] [GONRG-5702] Added workflow bootstrap

---
 modules/osdu/helm-workflow.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/osdu/helm-workflow.tf b/modules/osdu/helm-workflow.tf
index eba30356..395e06fb 100644
--- a/modules/osdu/helm-workflow.tf
+++ b/modules/osdu/helm-workflow.tf
@@ -1,6 +1,6 @@
 locals {
-  workflow_name  = "workflow"
-  workflow_image = "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-workflow"
+  workflow_name            = "workflow"
+  workflow_image           = "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-workflow"
   workflow_bootstrap_image = "community.opengroup.org:5555/osdu/platform/data-flow/ingestion/ingestion-workflow/osdu-gcp-bootstrap-workflow"
   workflow_roles_name = [
     "roles/datastore.user",
-- 
GitLab