From 4fa463ef53ed7ab3052f592c2459e67c80f96d8a Mon Sep 17 00:00:00 2001
From: Gor Gevorgyan1 <gor_gevorgyan1@epam.com>
Date: Tue, 10 Dec 2024 14:10:59 +0400
Subject: [PATCH 1/4] TF for EDS
---
helm/osdu-gc-baremetal/Chart.yaml | 6 ---
helm/osdu-gc-baremetal/values.yaml | 5 ---
modules/osdu_k8s/files/templates/values.tpl | 8 ----
modules/osdu_k8s/helm_eds.tf | 50 +++++++++++++++++++++
modules/osdu_k8s/inputs_versions.tf | 6 +++
modules/osdu_k8s/values-tpl.tf | 1 -
6 files changed, 56 insertions(+), 20 deletions(-)
create mode 100644 modules/osdu_k8s/helm_eds.tf
diff --git a/helm/osdu-gc-baremetal/Chart.yaml b/helm/osdu-gc-baremetal/Chart.yaml
index 1fc075b66..b6469c3bb 100755
--- a/helm/osdu-gc-baremetal/Chart.yaml
+++ b/helm/osdu-gc-baremetal/Chart.yaml
@@ -192,12 +192,6 @@ dependencies:
repository: oci://community.opengroup.org:5555/osdu/platform/security-and-compliance/secret/gc-helm
condition: gc_secret_deploy.enabled
alias: gc_secret_deploy
- ## EDS DMS
- - name: gc-eds-dms-deploy
- version: 0.0.7-latest
- repository: oci://community.opengroup.org:5555/osdu/platform/data-flow/ingestion/external-data-sources/eds-dms/gc-helm
- condition: gc_eds_dms_deploy.enabled
- alias: gc_eds_dms_deploy
## Open ETP client
- name: gc-oetp-client-deploy
version: 0.0.7-latest
diff --git a/helm/osdu-gc-baremetal/values.yaml b/helm/osdu-gc-baremetal/values.yaml
index adcab4068..06d62efd5 100644
--- a/helm/osdu-gc-baremetal/values.yaml
+++ b/helm/osdu-gc-baremetal/values.yaml
@@ -484,11 +484,6 @@ gc_secret_deploy:
V1Disabled: "true"
# --- End of Secret service values --- #
-# --- EDS DMS values --- #
-gc_eds_dms_deploy:
- enabled: true
-# --- End of EDS DMS values --- #
-
# --- Open ETP client values --- #
gc_oetp_client_deploy:
enabled: false
diff --git a/modules/osdu_k8s/files/templates/values.tpl b/modules/osdu_k8s/files/templates/values.tpl
index 85060aef3..0752bf8e2 100644
--- a/modules/osdu_k8s/files/templates/values.tpl
+++ b/modules/osdu_k8s/files/templates/values.tpl
@@ -246,14 +246,6 @@ gc_secret_deploy:
logLevel: ${log_level}
# --- End of Secret service values --- #
-# --- EDS DMS values --- #
-gc_eds_dms_deploy:
- enabled: ${eds_dms_enabled}
- conf:
- replicas: ${replicas}
- logLevel: ${log_level}
-# --- End of EDS DMS values --- #
-
# --- Open ETP client values --- #
gc_oetp_client_deploy:
enabled: ${oetp_client_enabled}
diff --git a/modules/osdu_k8s/helm_eds.tf b/modules/osdu_k8s/helm_eds.tf
new file mode 100644
index 000000000..eb42e7f2e
--- /dev/null
+++ b/modules/osdu_k8s/helm_eds.tf
@@ -0,0 +1,50 @@
+/**
+* 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
+ depends_on = []
+ 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
+ }
+}
diff --git a/modules/osdu_k8s/inputs_versions.tf b/modules/osdu_k8s/inputs_versions.tf
index c65e5d8d1..1f8a9b8ec 100644
--- a/modules/osdu_k8s/inputs_versions.tf
+++ b/modules/osdu_k8s/inputs_versions.tf
@@ -68,3 +68,9 @@ variable "crs-catalog_svc_version" {
type = string
default = "0.0.7-latest"
}
+
+variable "eds_svc_version" {
+ description = "Version of the eds service"
+ type = string
+ default = "0.0.7-latest"
+}
diff --git a/modules/osdu_k8s/values-tpl.tf b/modules/osdu_k8s/values-tpl.tf
index c5cc49c83..d44388919 100644
--- a/modules/osdu_k8s/values-tpl.tf
+++ b/modules/osdu_k8s/values-tpl.tf
@@ -72,7 +72,6 @@ resource "local_file" "helm_values" {
wellbore_enabled = var.wellbore_enabled
wellbore_worker_enabled = var.wellbore_worker_enabled
secret_enabled = var.secret_enabled
- eds_dms_enabled = var.eds_dms_enabled
oetp_client_enabled = var.oetp_client_enabled
oetp_server_enabled = var.oetp_server_enabled
dfaas_tests_enabled = var.dfaas_tests_enabled
--
GitLab
From 82e5b66eb437cc6a49ab26a4e24fbb7f105b2b0b Mon Sep 17 00:00:00 2001
From: Gor Gevorgyan1 <gor_gevorgyan1@epam.com>
Date: Tue, 10 Dec 2024 14:46:55 +0400
Subject: [PATCH 2/4] TF-HELM for EDS
---
modules/osdu_k8s/helm_eds.tf | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/modules/osdu_k8s/helm_eds.tf b/modules/osdu_k8s/helm_eds.tf
index eb42e7f2e..c69d0e636 100644
--- a/modules/osdu_k8s/helm_eds.tf
+++ b/modules/osdu_k8s/helm_eds.tf
@@ -17,7 +17,10 @@
resource "helm_release" "eds" {
count = var.eds_enabled ? 1 : 0
- depends_on = []
+ depends_on = [
+ helm_release.gc_secrets,
+ helm_release.k8s-resources,
+ ]
name = "eds"
repository = "oci://${var.repository}/osdu/platform/data-flow/ingestion/external-data-sources/eds-dms/gc-helm"
chart = "gc-eds-dms-deploy"
--
GitLab
From a669fc0faaa28a8513026c8cbcba3ac92f385949 Mon Sep 17 00:00:00 2001
From: Gor Gevorgyan1 <gor_gevorgyan1@epam.com>
Date: Tue, 10 Dec 2024 14:56:42 +0400
Subject: [PATCH 3/4] tf for wellbore
---
helm/osdu-gc-baremetal/Chart.yaml | 6 ---
helm/osdu-gc-baremetal/values.yaml | 5 --
modules/osdu_k8s/files/templates/values.tpl | 8 ----
modules/osdu_k8s/helm_wellbore.tf | 53 +++++++++++++++++++++
modules/osdu_k8s/inputs_versions.tf | 5 ++
modules/osdu_k8s/values-tpl.tf | 1 -
6 files changed, 58 insertions(+), 20 deletions(-)
create mode 100644 modules/osdu_k8s/helm_wellbore.tf
diff --git a/helm/osdu-gc-baremetal/Chart.yaml b/helm/osdu-gc-baremetal/Chart.yaml
index b6469c3bb..7f5b35091 100755
--- a/helm/osdu-gc-baremetal/Chart.yaml
+++ b/helm/osdu-gc-baremetal/Chart.yaml
@@ -155,12 +155,6 @@ dependencies:
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
diff --git a/helm/osdu-gc-baremetal/values.yaml b/helm/osdu-gc-baremetal/values.yaml
index 06d62efd5..4a5499e36 100644
--- a/helm/osdu-gc-baremetal/values.yaml
+++ b/helm/osdu-gc-baremetal/values.yaml
@@ -467,11 +467,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
diff --git a/modules/osdu_k8s/files/templates/values.tpl b/modules/osdu_k8s/files/templates/values.tpl
index 0752bf8e2..462db1ace 100644
--- a/modules/osdu_k8s/files/templates/values.tpl
+++ b/modules/osdu_k8s/files/templates/values.tpl
@@ -222,14 +222,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}
diff --git a/modules/osdu_k8s/helm_wellbore.tf b/modules/osdu_k8s/helm_wellbore.tf
new file mode 100644
index 000000000..3ad876ec5
--- /dev/null
+++ b/modules/osdu_k8s/helm_wellbore.tf
@@ -0,0 +1,53 @@
+/**
+* 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.eds_enabled ? 1 : 0
+ depends_on = [
+ helm_release.gc_secrets,
+ helm_release.k8s-resources,
+ ]
+ 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
+ }
+}
diff --git a/modules/osdu_k8s/inputs_versions.tf b/modules/osdu_k8s/inputs_versions.tf
index 1f8a9b8ec..faafcaca9 100644
--- a/modules/osdu_k8s/inputs_versions.tf
+++ b/modules/osdu_k8s/inputs_versions.tf
@@ -74,3 +74,8 @@ variable "eds_svc_version" {
type = string
default = "0.0.7-latest"
}
+variable "wellbore_svc_version" {
+ description = "Version of the wellbore service"
+ type = string
+ default = "0.0.7-latest"
+}
diff --git a/modules/osdu_k8s/values-tpl.tf b/modules/osdu_k8s/values-tpl.tf
index d44388919..ded4b8dfd 100644
--- a/modules/osdu_k8s/values-tpl.tf
+++ b/modules/osdu_k8s/values-tpl.tf
@@ -69,7 +69,6 @@ resource "local_file" "helm_values" {
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
--
GitLab
From 2430180bbb6da4ef3cd98151e809b68523580b1b Mon Sep 17 00:00:00 2001
From: Gor Gevorgyan1 <gor_gevorgyan1@epam.com>
Date: Tue, 10 Dec 2024 15:07:22 +0400
Subject: [PATCH 4/4] tf-helm for wellbore
---
modules/osdu_k8s/helm_wellbore.tf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/osdu_k8s/helm_wellbore.tf b/modules/osdu_k8s/helm_wellbore.tf
index 3ad876ec5..2e42432bf 100644
--- a/modules/osdu_k8s/helm_wellbore.tf
+++ b/modules/osdu_k8s/helm_wellbore.tf
@@ -16,7 +16,7 @@
*/
resource "helm_release" "wellbore" {
- count = var.eds_enabled ? 1 : 0
+ count = var.wellbore_enabled ? 1 : 0
depends_on = [
helm_release.gc_secrets,
helm_release.k8s-resources,
--
GitLab