From afae229d3a7eb8c20633e049d3f597fb2eab7bbc Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 8 Dec 2020 10:48:29 +0100
Subject: [COMMON] Configure paths for Ingress

Instead of globally choosing between virtualhosts and path based
ingress, it's better to allow to choose it per component.

Issue-ID: OOM-2641
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I952826d03722693ebae7c95a083b95bf83752d68
---
 kubernetes/dcaemod/components/dcaemod-designtool/values.yaml  | 11 ++++++-----
 .../dcaemod/components/dcaemod-distributor-api/values.yaml    |  8 ++++----
 .../dcaemod/components/dcaemod-genprocessor/values.yaml       |  7 ++++---
 .../dcaemod/components/dcaemod-onboarding-api/values.yaml     |  8 +++++---
 4 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'kubernetes/dcaemod/components')

diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
index 3daca28476..74c7bdb223 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
@@ -22,11 +22,9 @@ global:
   persistence: {}
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-
   ingress:
-    enabled: true
     virtualhost:
-        enabled: false
+      baseurl: "simpledemo.onap.org"
 
 config:
   nifiJarsIndexURL: http://dcaemod-genprocessor:8080/nifi-jars
@@ -44,11 +42,14 @@ service:
 
 ingress:
     enabled: true
+    enabledOverride: true
     service:
-    - baseaddr: "nifi"
+    - baseaddr: "dcaemod"
+      path: "/nifi"
       name: "dcaemod-designtool"
       port: 8080
-    - baseaddr: "nifi-api"
+    - baseaddr: "dcaemod"
+      path: "/nifi-api"
       name: "dcaemod-designtool"
       port: 8080
     config:
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
index 274edcd4a3..541f239d77 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
@@ -22,11 +22,9 @@ global:
   persistence: {}
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-
   ingress:
-    enabled: true
     virtualhost:
-        enabled: false
+      baseurl: "simpledemo.onap.org"
 
 config:
   nifiRegistryURL: http://dcaemod-nifi-registry:18080/nifi-registry-api
@@ -44,8 +42,10 @@ service:
 
 ingress:
     enabled: true
+    enabledOverride: true
     service:
-    - baseaddr: "distributor"
+    - baseaddr: "dcaemod"
+      path: "/distributor"
       name: dcaemod-distributor-api
       port: 8080
     config:
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
index 45ae96f2d2..4b79525c83 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
@@ -23,9 +23,8 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
   ingress:
-    enabled: true
     virtualhost:
-        enabled: false
+      baseurl: "simpledemo.onap.org"
 
 config:
   onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding
@@ -43,8 +42,10 @@ service:
 
 ingress:
   enabled: true
+  enabledOverride: true
   service:
-  - baseaddr: "nifi-jars"
+  - baseaddr: "dcaemod"
+    path: "/nifi-jars"
     name: dcaemod-genprocessor
     port: 8080
   config:
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
index 42fe9d8f56..13ea930aa5 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
@@ -22,9 +22,9 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
   ingress:
-    enabled: true
     virtualhost:
-        enabled: false
+      baseurl: "simpledemo.onap.org"
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -48,8 +48,10 @@ service:
       port: 8080
 ingress:
   enabled: true
+  enabledOverride: true
   service:
-  - baseaddr: "onboarding"
+  - baseaddr: "dcaemod"
+    path: "/onboarding"
     name: dcaemod-onboarding-api
     port: 8080
   config:
-- 
cgit 1.2.3-korg