Merge "Example ingress configuration with vhosts"

diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
similarity index 78%
rename from kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
rename to kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index 7ef1e02..291a032 100644 (file)
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -68,16 +68,14 @@ sdnc:
   enabled: true
 so:
   enabled: true
+  ingress:
+    enabled: true
   so-monitoring:
+    ingress:
+      enabled: true
+  so-vnfm-adapter:
+    ingress:
       enabled: true
-      ingress:
-          enabled: true
-          service:
-              - path: "/so-monitoring"
-                name: "so-monitoring"
-                port: 9091
-          annotations:
-            nginx.ingress.kubernetes.io/ssl-redirect: "false"
 uui:
   enabled: true
 vfc:
@@ -85,15 +83,11 @@ vfc:
 vid:
   enabled: true
   ingress:
-   enabled: true
-   service:
-       - path: "/vid"
-         name: "vid-http"
-         port: 8080
-   annotations:
-         nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    enabled: true
 vnfsdk:
   enabled: true
-nginx-ingress:
-    enabled: true
 
+#ingress virtualhost based configuration
+global:
+  ingress:
+    enabled: true