aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-12-11 10:00:18 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-11 10:00:18 +0000
commit4d31247da5a8202f89db9761cae62cbb2c66a585 (patch)
tree8f3dd21bbd8ac2268697ac13ad86e96a38f743f3
parent9368b1aa2fd9e8bff7f3f87ef8ddb0a4f67ee1ce (diff)
parent72b12159156ef12b0cdab57fc8f1a7372bf2cade (diff)
Merge "Add ingress controller support to AAF"
-rw-r--r--kubernetes/aaf/charts/aaf-cm/templates/ingress.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-cm/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-fs/templates/ingress.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-fs/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-gui/templates/ingress.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-gui/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-hello/templates/ingress.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-hello/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-locate/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-service/templates/ingress.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-service/values.yaml6
13 files changed, 66 insertions, 0 deletions
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-cm/templates/ingress.yaml
new file mode 100644
index 0000000000..40b4bba0ce
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-cm/templates/ingress.yaml
@@ -0,0 +1,4 @@
+
+{{ include "common.ingress" . }}
+
+
diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml
index 6ace7d1143..79e74f107e 100644
--- a/kubernetes/aaf/charts/aaf-cm/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/values.yaml
@@ -52,6 +52,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aafcm"
+ name: "aaf-cm"
+ port: 8150
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-fs/templates/ingress.yaml
new file mode 100644
index 0000000000..40b4bba0ce
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-fs/templates/ingress.yaml
@@ -0,0 +1,4 @@
+
+{{ include "common.ingress" . }}
+
+
diff --git a/kubernetes/aaf/charts/aaf-fs/values.yaml b/kubernetes/aaf/charts/aaf-fs/values.yaml
index 48ad7c10df..67b3d2fe90 100644
--- a/kubernetes/aaf/charts/aaf-fs/values.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/values.yaml
@@ -54,6 +54,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aaffs"
+ name: "aaf-fs"
+ port: 8096
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-gui/templates/ingress.yaml
new file mode 100644
index 0000000000..40b4bba0ce
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-gui/templates/ingress.yaml
@@ -0,0 +1,4 @@
+
+{{ include "common.ingress" . }}
+
+
diff --git a/kubernetes/aaf/charts/aaf-gui/values.yaml b/kubernetes/aaf/charts/aaf-gui/values.yaml
index 3068f14ec9..ba287a85ac 100644
--- a/kubernetes/aaf/charts/aaf-gui/values.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/values.yaml
@@ -56,6 +56,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aafgui"
+ name: "aaf-gui"
+ port: 8200
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-hello/templates/ingress.yaml
new file mode 100644
index 0000000000..40b4bba0ce
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-hello/templates/ingress.yaml
@@ -0,0 +1,4 @@
+
+{{ include "common.ingress" . }}
+
+
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index ea6665c61a..4ea66733f2 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/values.yaml
@@ -71,6 +71,12 @@ readiness:
ingress:
enabled: false
+ service:
+ - baseaddr: "aafhello"
+ name: "aaf-hello"
+ port: 8130
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml
new file mode 100644
index 0000000000..40b4bba0ce
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml
@@ -0,0 +1,4 @@
+
+{{ include "common.ingress" . }}
+
+
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index c13f83497f..82ad3b3b94 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -52,6 +52,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aaflocate"
+ name: "aaf-locate"
+ port: 8095
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}
diff --git a/kubernetes/aaf/charts/aaf-oauth/values.yaml b/kubernetes/aaf/charts/aaf-oauth/values.yaml
index 3c29a62977..2ffeea8478 100644
--- a/kubernetes/aaf/charts/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/values.yaml
@@ -51,6 +51,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aafoauth"
+ name: "aaf-oauth"
+ port: 8140
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}
diff --git a/kubernetes/aaf/charts/aaf-service/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-service/templates/ingress.yaml
new file mode 100644
index 0000000000..40b4bba0ce
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-service/templates/ingress.yaml
@@ -0,0 +1,4 @@
+
+{{ include "common.ingress" . }}
+
+
diff --git a/kubernetes/aaf/charts/aaf-service/values.yaml b/kubernetes/aaf/charts/aaf-service/values.yaml
index 8794afe0ce..c8067bf6e6 100644
--- a/kubernetes/aaf/charts/aaf-service/values.yaml
+++ b/kubernetes/aaf/charts/aaf-service/values.yaml
@@ -52,6 +52,12 @@ service:
ingress:
enabled: false
+ service:
+ - baseaddr: "aafservice"
+ name: "aaf-service"
+ port: 8100
+ config:
+ ssl: "none"
# Configure resource requests and limits
resources: {}