From faf19854ab4b6b6e3d0a61db4ea50313bcee6c14 Mon Sep 17 00:00:00 2001 From: Lucjan Bryndza Date: Mon, 2 Dec 2019 13:30:20 +0100 Subject: Add ingress controler support to CLI Issue-ID: OOM-2176 Signed-off-by: Lucjan Bryndza Change-Id: I131e8153024f18ff5a08fa29966ed9be8c850946 Signed-off-by: Lucjan Bryndza --- kubernetes/cli/templates/ingress.yaml | 1 + kubernetes/cli/values.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 kubernetes/cli/templates/ingress.yaml (limited to 'kubernetes') diff --git a/kubernetes/cli/templates/ingress.yaml b/kubernetes/cli/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/cli/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml index 0fbe21dd4c..7278c99a5f 100644 --- a/kubernetes/cli/values.yaml +++ b/kubernetes/cli/values.yaml @@ -63,6 +63,15 @@ service: ingress: enabled: false + service: + - baseaddr: "cli" + name: "cli" + port: 8080 + - baseaddr: "cli2" + name: cli + port: 9090 + config: + ssl: "none" # Configure resource requests and limits # ref: http://kubernetes.io/docs/user-guide/compute-resources/ -- cgit 1.2.3-korg From 9e044a5139abe7c6b7ba726ecdf02941d61721f9 Mon Sep 17 00:00:00 2001 From: Lucjan Bryndza Date: Mon, 2 Dec 2019 14:04:44 +0100 Subject: Add ingress controler support to CLAMP Issue-ID: OOM-2175 Change-Id: I15359ebc3116bf453c2a2b3ce706ead6024797bf Signed-off-by: Lucjan Bryndza --- kubernetes/clamp/templates/ingress.yaml | 1 + kubernetes/clamp/values.yaml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 kubernetes/clamp/templates/ingress.yaml (limited to 'kubernetes') diff --git a/kubernetes/clamp/templates/ingress.yaml b/kubernetes/clamp/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/clamp/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 92d4bb7359..d66273dce1 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -83,6 +83,12 @@ service: ingress: enabled: false + service: + - baseaddr: "clamp" + name: "clamp" + port: 443 + config: + ssl: "redirect" #resources: {} # We usually recommend not to specify default resources and to leave this as a conscious -- cgit 1.2.3-korg From 5bf25c70b915b8b41c173040d9b4e57d846ec4d6 Mon Sep 17 00:00:00 2001 From: Lucjan Bryndza Date: Mon, 2 Dec 2019 14:18:47 +0100 Subject: Add ingress controler support to VNFSDK Issue-ID: OOM-2192 Signed-off-by: Lucjan Bryndza Change-Id: I9767e8ffaa27c68ecdb3a8882d4f718af1488ab0 Signed-off-by: Lucjan Bryndza --- kubernetes/vnfsdk/templates/ingress.yaml | 1 + kubernetes/vnfsdk/values.yaml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 kubernetes/vnfsdk/templates/ingress.yaml (limited to 'kubernetes') diff --git a/kubernetes/vnfsdk/templates/ingress.yaml b/kubernetes/vnfsdk/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/vnfsdk/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml index 2b6fd99b2e..55f81acc24 100644 --- a/kubernetes/vnfsdk/values.yaml +++ b/kubernetes/vnfsdk/values.yaml @@ -113,3 +113,9 @@ service: ingress: enabled: false + service: + - baseaddr: "refrepo" + name: "refrepo" + port: 97 + config: + ssl: "none" -- cgit 1.2.3-korg From eaeab3be2537ddfa197b1aaccd817bc48ee599c3 Mon Sep 17 00:00:00 2001 From: Lucjan Bryndza Date: Mon, 2 Dec 2019 14:40:04 +0100 Subject: Add ingress controler support to DCAE Issue-ID: OOM-2178 Signed-off-by: Lucjan Bryndza Change-Id: Id4c679431d5d5e0362acbd08757250f1bb5a0616 Signed-off-by: Lucjan Bryndza --- .../dcaegen2/components/dcae-redis/templates/ingress.yaml | 1 + kubernetes/dcaegen2/components/dcae-redis/values.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 kubernetes/dcaegen2/components/dcae-redis/templates/ingress.yaml (limited to 'kubernetes') diff --git a/kubernetes/dcaegen2/components/dcae-redis/templates/ingress.yaml b/kubernetes/dcaegen2/components/dcae-redis/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/dcaegen2/components/dcae-redis/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/dcaegen2/components/dcae-redis/values.yaml b/kubernetes/dcaegen2/components/dcae-redis/values.yaml index 40812f2144..0b342e81bb 100644 --- a/kubernetes/dcaegen2/components/dcae-redis/values.yaml +++ b/kubernetes/dcaegen2/components/dcae-redis/values.yaml @@ -93,7 +93,15 @@ persistence: ingress: enabled: false - + service: + - baseaddr: "dcaeredis" + name: "dcae-redis" + port: 6379 + - baseaddr: "dcaeredisgossip" + name: "dcae-redis" + port: 16379 + config: + ssl: "none" # Resource Limit flavor -By Default using small flavor: small # Segregation for Different environment (Small and Large) -- cgit 1.2.3-korg From a7228ec10d258269acbe67330987dcd806ab43c7 Mon Sep 17 00:00:00 2001 From: Lucjan Bryndza Date: Mon, 2 Dec 2019 15:11:53 +0100 Subject: Add ingress controler support to MSB Issue-ID: OOM-2181 Change-Id: I3a419138e4e553719f7f9f9b958d448f6c5cea24 Signed-off-by: Lucjan Bryndza --- kubernetes/msb/charts/msb-consul/templates/ingress.yaml | 1 + kubernetes/msb/charts/msb-consul/values.yaml | 6 ++++++ kubernetes/msb/charts/msb-discovery/templates/ingress.yaml | 1 + kubernetes/msb/charts/msb-discovery/values.yaml | 6 ++++++ kubernetes/msb/charts/msb-eag/templates/ingress.yaml | 1 + kubernetes/msb/charts/msb-eag/values.yaml | 6 ++++++ kubernetes/msb/charts/msb-iag/templates/ingress.yaml | 1 + kubernetes/msb/charts/msb-iag/values.yaml | 6 ++++++ 8 files changed, 28 insertions(+) create mode 100644 kubernetes/msb/charts/msb-consul/templates/ingress.yaml create mode 100644 kubernetes/msb/charts/msb-discovery/templates/ingress.yaml create mode 100644 kubernetes/msb/charts/msb-eag/templates/ingress.yaml create mode 100644 kubernetes/msb/charts/msb-iag/templates/ingress.yaml (limited to 'kubernetes') diff --git a/kubernetes/msb/charts/msb-consul/templates/ingress.yaml b/kubernetes/msb/charts/msb-consul/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/msb/charts/msb-consul/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/msb/charts/msb-consul/values.yaml b/kubernetes/msb/charts/msb-consul/values.yaml index 1693f22600..d11649754f 100644 --- a/kubernetes/msb/charts/msb-consul/values.yaml +++ b/kubernetes/msb/charts/msb-consul/values.yaml @@ -57,6 +57,12 @@ service: ingress: enabled: false + service: + - baseaddr: "msbconsul" + name: "msb-consul" + port: 8500 + config: + ssl: "none" flavor: small diff --git a/kubernetes/msb/charts/msb-discovery/templates/ingress.yaml b/kubernetes/msb/charts/msb-discovery/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/msb/charts/msb-discovery/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/charts/msb-discovery/values.yaml index 10315d6b63..abb12775e8 100644 --- a/kubernetes/msb/charts/msb-discovery/values.yaml +++ b/kubernetes/msb/charts/msb-discovery/values.yaml @@ -59,6 +59,12 @@ service: ingress: enabled: false + service: + - baseaddr: "msbdiscovery" + name: "msb-discovery" + port: 10081 + config: + ssl: "none" # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/msb/charts/msb-eag/templates/ingress.yaml b/kubernetes/msb/charts/msb-eag/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/msb/charts/msb-eag/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/charts/msb-eag/values.yaml index e7bf415c4e..535c135d25 100644 --- a/kubernetes/msb/charts/msb-eag/values.yaml +++ b/kubernetes/msb/charts/msb-eag/values.yaml @@ -62,6 +62,12 @@ service: ingress: enabled: false + service: + - baseaddr: "msbeag" + name: "msb-eag" + port: 443 + config: + ssl: "redirect" # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/msb/charts/msb-iag/templates/ingress.yaml b/kubernetes/msb/charts/msb-iag/templates/ingress.yaml new file mode 100644 index 0000000000..8f87c68f1e --- /dev/null +++ b/kubernetes/msb/charts/msb-iag/templates/ingress.yaml @@ -0,0 +1 @@ +{{ include "common.ingress" . }} diff --git a/kubernetes/msb/charts/msb-iag/values.yaml b/kubernetes/msb/charts/msb-iag/values.yaml index 4aaeaeadc3..6d1f7ac3e6 100644 --- a/kubernetes/msb/charts/msb-iag/values.yaml +++ b/kubernetes/msb/charts/msb-iag/values.yaml @@ -63,6 +63,12 @@ service: ingress: enabled: false + service: + - baseaddr: "msbiag" + name: "msb-iag" + port: 443 + config: + ssl: "redirect" # Resource Limit flavor -By Default using small flavor: small -- cgit 1.2.3-korg