summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2020-02-18 13:54:22 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-18 13:54:22 +0000
commit23f076495d36081f34a367067918d15fcc5ada8d (patch)
tree3a64994a58f14f89a2b26c308e6b3cbb1d183986
parent764cd8514707c1630dbfa6792b8d15953d5b9a59 (diff)
parenta85362d9a0ece87f8cf64ca7949cf7bdb97b70a3 (diff)
Merge "Add ingress controler support to AAI"
-rw-r--r--components/aai-babel/templates/ingress.yaml1
-rw-r--r--components/aai-babel/values.yaml6
-rw-r--r--components/aai-modelloader/templates/ingress.yaml1
-rw-r--r--components/aai-modelloader/values.yaml7
-rw-r--r--components/aai-sparky-be/templates/ingress.yaml1
-rw-r--r--components/aai-sparky-be/values.yaml6
-rw-r--r--templates/ingress.yaml1
-rw-r--r--values.yaml6
8 files changed, 28 insertions, 1 deletions
diff --git a/components/aai-babel/templates/ingress.yaml b/components/aai-babel/templates/ingress.yaml
new file mode 100644
index 0000000..8f87c68
--- /dev/null
+++ b/components/aai-babel/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}
diff --git a/components/aai-babel/values.yaml b/components/aai-babel/values.yaml
index 8d1ba31..427e30b 100644
--- a/components/aai-babel/values.yaml
+++ b/components/aai-babel/values.yaml
@@ -62,6 +62,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aaibabel"
+ name: "aai-babel"
+ port: 9516
+ config:
+ ssl: "none"
resources:
small:
diff --git a/components/aai-modelloader/templates/ingress.yaml b/components/aai-modelloader/templates/ingress.yaml
new file mode 100644
index 0000000..8f87c68
--- /dev/null
+++ b/components/aai-modelloader/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}
diff --git a/components/aai-modelloader/values.yaml b/components/aai-modelloader/values.yaml
index 9ce9ab2..e1c36dc 100644
--- a/components/aai-modelloader/values.yaml
+++ b/components/aai-modelloader/values.yaml
@@ -60,7 +60,12 @@ service:
ingress:
enabled: false
-
+ service:
+ - baseaddr: "aaimodelloader"
+ name: "aai-modelloader"
+ port: 8443
+ config:
+ ssl: "redirect"
resources:
small:
diff --git a/components/aai-sparky-be/templates/ingress.yaml b/components/aai-sparky-be/templates/ingress.yaml
new file mode 100644
index 0000000..8f87c68
--- /dev/null
+++ b/components/aai-sparky-be/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}
diff --git a/components/aai-sparky-be/values.yaml b/components/aai-sparky-be/values.yaml
index f6be792..28bdf9d 100644
--- a/components/aai-sparky-be/values.yaml
+++ b/components/aai-sparky-be/values.yaml
@@ -90,6 +90,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aaisparkybe"
+ name: "aai-sparky-be"
+ port: 8000
+ config:
+ ssl: "none"
# Configure resource requests and limits
# ref: http://kubernetes.io/docs/user-guide/compute-resources/
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
new file mode 100644
index 0000000..8f87c68
--- /dev/null
+++ b/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}
diff --git a/values.yaml b/values.yaml
index f389a93..5101d1e 100644
--- a/values.yaml
+++ b/values.yaml
@@ -355,6 +355,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aai"
+ name: "aai"
+ port: 8443
+ config:
+ ssl: "redirect"
resources:
small: