From 48fc5bfd30ede67cedf88dd489b0e0581b2561f0 Mon Sep 17 00:00:00 2001
From: Danylo Vanin <danylo_vanin@epam.com>
Date: Thu, 19 May 2022 14:50:14 +0300
Subject: [PATCH] [GONRG-4919] Updated search helm values & removed fqdn

---
 modules/osdu/helm-crs-catalog.tf    |  6 +++---
 modules/osdu/helm-crs-conversion.tf |  4 ++--
 modules/osdu/helm-dataset.tf        |  8 ++++----
 modules/osdu/helm-file.tf           |  8 ++++----
 modules/osdu/helm-notification.tf   |  6 +++---
 modules/osdu/helm-schema.tf         |  2 +-
 modules/osdu/helm-search.tf         | 16 ++++++++--------
 modules/osdu/helm-seismic-store.tf  |  6 +++---
 modules/osdu/helm-workflow.tf       |  6 +++---
 modules/osdu/helm_entitlements.tf   |  4 ++--
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/modules/osdu/helm-crs-catalog.tf b/modules/osdu/helm-crs-catalog.tf
index a99a4212..8fed64e2 100644
--- a/modules/osdu/helm-crs-catalog.tf
+++ b/modules/osdu/helm-crs-catalog.tf
@@ -38,11 +38,11 @@ resource "helm_release" "crs_catalog_config" {
   }
   set {
     name  = "data.entitlement_url"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    value = "http://${local.ent_name}/api/entitlements/v2"
   }
   set {
     name  = "data.crs_catalog_host_name"
-    value = "${local.crs_catalog_name}.default.svc.cluster.local"
+    value = "${local.crs_catalog_name}"
   }
   set {
     name  = "data.audiences"
@@ -50,7 +50,7 @@ resource "helm_release" "crs_catalog_config" {
   }
   set {
     name  = "data.partition_api"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1/"
+    value = "http://${local.partition_name}/api/partition/v1/"
   }
   set {
     name  = "data.google_audiences"
diff --git a/modules/osdu/helm-crs-conversion.tf b/modules/osdu/helm-crs-conversion.tf
index ec8ee347..e2a9210d 100644
--- a/modules/osdu/helm-crs-conversion.tf
+++ b/modules/osdu/helm-crs-conversion.tf
@@ -38,11 +38,11 @@ resource "helm_release" "crs_conversion_config" {
   }
   set {
     name  = "data.partition_api"
-    value = "${local.partition_name}.default.svc.cluster.local/api/partition/v1"
+    value = "${local.partition_name}/api/partition/v1"
   }
   set {
     name  = "data.entitlements_api"
-    value = "${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    value = "${local.ent_name}/api/entitlements/v2"
   }
   set {
     name  = "data.log_level"
diff --git a/modules/osdu/helm-dataset.tf b/modules/osdu/helm-dataset.tf
index 7ea507e5..619a03a9 100644
--- a/modules/osdu/helm-dataset.tf
+++ b/modules/osdu/helm-dataset.tf
@@ -31,19 +31,19 @@ resource "helm_release" "dataset-config" {
 
   set {
     name  = "data.authorize_api"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    value = "http://${local.ent_name}/api/entitlements/v2"
   }
   set {
     name  = "data.partition_api"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1"
+    value = "http://${local.partition_name}/api/partition/v1"
   }
   set {
     name  = "data.schema_api"
-    value = "http://${local.schema_name}.default.svc.cluster.local/api/schema-service/v1"
+    value = "http://${local.schema_name}/api/schema-service/v1"
   }
   set {
     name  = "data.storage_api"
-    value = "http://${local.schema_name}.default.svc.cluster.local/api/storage/v2"
+    value = "http://${local.schema_name}/api/storage/v2"
   }
   set {
     name  = "data.file_dms_bucket"
diff --git a/modules/osdu/helm-file.tf b/modules/osdu/helm-file.tf
index 5a954bd5..f0a5ab6a 100644
--- a/modules/osdu/helm-file.tf
+++ b/modules/osdu/helm-file.tf
@@ -36,7 +36,7 @@ resource "helm_release" "file-config" {
   }
   set {
     name  = "data.osdu_entitlements_url"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2/"
+    value = "http://${local.ent_name}/api/entitlements/v2/"
   }
   # bucket name is used for single combined data and service project - should be updated to support multi- data projects implementation
   set {
@@ -45,7 +45,7 @@ resource "helm_release" "file-config" {
   }
   set {
     name  = "data.partition_api"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1/"
+    value = "http://${local.partition_name}/api/partition/v1/"
   }
   set {
     name  = "data.audiences"
@@ -61,11 +61,11 @@ resource "helm_release" "file-config" {
   }
   set {
     name  = "data.storage_api"
-    value = "http://${local.storage_name}.default.svc.cluster.local/api/storage/v2/"
+    value = "http://${local.storage_name}/api/storage/v2/"
   }
   set {
     name  = "data.gcp_records_url"
-    value = "http://${local.storage_name}.default.svc.cluster.local/api/storage/v2/"
+    value = "http://${local.storage_name}/api/storage/v2/"
   }
 }
 
diff --git a/modules/osdu/helm-notification.tf b/modules/osdu/helm-notification.tf
index d9012a50..784762f8 100644
--- a/modules/osdu/helm-notification.tf
+++ b/modules/osdu/helm-notification.tf
@@ -39,11 +39,11 @@ resource "helm_release" "notification-config" {
   }
   set {
     name  = "data.app_entitlements"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    value = "http://${local.ent_name}/api/entitlements/v2"
   }
   set {
     name  = "data.app_register"
-    value = "http://${local.register_name}.default.svc.cluster.local/api/register/v1"
+    value = "http://${local.register_name}/api/register/v1"
   }
   set {
     name  = "data.app_googleaudience"
@@ -51,7 +51,7 @@ resource "helm_release" "notification-config" {
   }
   set {
     name  = "data.partition_api"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1"
+    value = "http://${local.partition_name}/api/partition/v1"
   }
   set {
     name  = "data.google_audiences"
diff --git a/modules/osdu/helm-schema.tf b/modules/osdu/helm-schema.tf
index ab3acdee..f4f475e3 100644
--- a/modules/osdu/helm-schema.tf
+++ b/modules/osdu/helm-schema.tf
@@ -60,7 +60,7 @@ resource "helm_release" "schema-config" {
   }
   set {
     name  = "data.schema_host"
-    value = "http://${local.schema_name}.default.svc.cluster.local"
+    value = "http://${local.schema_name}"
   }
 }
 
diff --git a/modules/osdu/helm-search.tf b/modules/osdu/helm-search.tf
index ec9121b3..69f2645f 100644
--- a/modules/osdu/helm-search.tf
+++ b/modules/osdu/helm-search.tf
@@ -48,20 +48,20 @@ resource "helm_release" "search-config" {
     value = var.audiences
   }
   set {
-    name  = "data.indexer_host"
-    value = "http://${local.indexer_name}.default.svc.cluster.local/api/indexer/v2"
+    name  = "data.indexer_base_host"
+    value = "http://${local.indexer_name}"
   }
   set {
-    name  = "data.authorize_api"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    name  = "data.entitlements_host"
+    value = "http://${local.ent_name}"
   }
   set {
-    name  = "data.partition_api"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1"
+    name  = "data.partition_host"
+    value = "http://${local.partition_name}"
   }
   set {
-    name  = "data.policy_api"
-    value = "http://${local.policy_name}/api/policy/v1/"
+    name  = "data.policy_host"
+    value = "http://${local.policy_name}"
   }
   set {
     name  = "data.security_https_certificate_trust"
diff --git a/modules/osdu/helm-seismic-store.tf b/modules/osdu/helm-seismic-store.tf
index 0d8d6058..b57e7371 100644
--- a/modules/osdu/helm-seismic-store.tf
+++ b/modules/osdu/helm-seismic-store.tf
@@ -57,11 +57,11 @@ resource "helm_release" "seismic-store-config" {
   }
   set {
     name  = "data.des_service_host_storage"
-    value = "http://${local.storage_name}.default.svc.cluster.local/api/storage/v2"
+    value = "http://${local.storage_name}/api/storage/v2"
   }
   set {
     name  = "des_service_host_compliance"
-    value = "http://${local.legal_name}.default.svc.cluster.local/api/legal/v1"
+    value = "http://${local.legal_name}/api/legal/v1"
   }
   set {
     name  = "data.seistore_des_target_audience"
@@ -81,7 +81,7 @@ resource "helm_release" "seismic-store-config" {
   }
   set {
     name  = "data.des_service_host_entitlement"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api"
+    value = "http://${local.ent_name}/api"
   }
   set {
     name  = "data.seistore_des_appkey"
diff --git a/modules/osdu/helm-workflow.tf b/modules/osdu/helm-workflow.tf
index 492f2dc6..55cbdd84 100644
--- a/modules/osdu/helm-workflow.tf
+++ b/modules/osdu/helm-workflow.tf
@@ -37,15 +37,15 @@ resource "helm_release" "workflow-config" {
   }
   set {
     name  = "data.osdu_entitlements_url"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    value = "http://${local.ent_name}/api/entitlements/v2"
   }
   set {
     name  = "data.authorize_api"
-    value = "http://${local.ent_name}.default.svc.cluster.local/api/entitlements/v2"
+    value = "http://${local.ent_name}/api/entitlements/v2"
   }
   set {
     name  = "data.partition_api"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1/"
+    value = "http://${local.partition_name}/api/partition/v1/"
   }
   set {
     name  = "data.google_audiences"
diff --git a/modules/osdu/helm_entitlements.tf b/modules/osdu/helm_entitlements.tf
index c2290f55..a3c3d6f6 100644
--- a/modules/osdu/helm_entitlements.tf
+++ b/modules/osdu/helm_entitlements.tf
@@ -57,7 +57,7 @@ resource "helm_release" "ent-configmap" {
   }
   set {
     name  = "data.partitionApi"
-    value = "http://${local.partition_name}.default.svc.cluster.local/api/partition/v1"
+    value = "http://${local.partition_name}/api/partition/v1"
   }
   set {
     name  = "data.googleAudiences"
@@ -77,7 +77,7 @@ resource "helm_release" "ent-configmap" {
   }
   set {
     name  = "data.entitlementsHost"
-    value = "http://${local.ent_name}.default.svc.cluster.local"
+    value = "http://${local.ent_name}"
   }
   set {
     name  = "data.dataPartitionId"
-- 
GitLab