From a156ad31e471b3186cb3988e180d843d2ea391e5 Mon Sep 17 00:00:00 2001 From: Lucjan Bryndza Date: Mon, 7 Oct 2019 14:24:51 +0200 Subject: Example ingress configuration with vhosts Example ingress configuration with vhosting support. Signed-off-by: Lucjan Bryndza Issue-ID: OOM-2125 Change-Id: I62c818f8941871cbebdfbf1984e7b6eee7e1180d Signed-off-by: Lucjan Bryndza --- .../overrides/onap-all-ingress-nginx-vhost.yaml | 93 ++++++++++++++++++++ .../overrides/onap-all-ingress-nginx.yaml | 99 ---------------------- 2 files changed, 93 insertions(+), 99 deletions(-) create mode 100644 kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml delete mode 100644 kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml (limited to 'kubernetes/onap/resources/overrides') diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml new file mode 100644 index 0000000000..291a0321f7 --- /dev/null +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml @@ -0,0 +1,93 @@ +# Copyright © 2019 Amdocs, Bell Canada +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +################################################################### +# This override file enables helm charts for all ONAP applications. +################################################################### +cassandra: + enabled: true +mariadb-galera: + enabled: true + +aaf: + enabled: true +aai: + enabled: true +appc: + enabled: true +cds: + enabled: true +clamp: + enabled: true +cli: + enabled: true +consul: + enabled: true +contrib: + enabled: true +dcaegen2: + enabled: true +dmaap: + enabled: true +esr: + enabled: true +log: + enabled: true +sniro-emulator: + enabled: true +oof: + enabled: true +msb: + enabled: true +multicloud: + enabled: true +nbi: + enabled: true +policy: + enabled: true +pomba: + enabled: true +portal: + enabled: true +robot: + enabled: true +sdc: + enabled: true +sdnc: + enabled: true +so: + enabled: true + ingress: + enabled: true + so-monitoring: + ingress: + enabled: true + so-vnfm-adapter: + ingress: + enabled: true +uui: + enabled: true +vfc: + enabled: true +vid: + enabled: true + ingress: + enabled: true +vnfsdk: + enabled: true + +#ingress virtualhost based configuration +global: + ingress: + enabled: true diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml deleted file mode 100644 index 7ef1e02714..0000000000 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright © 2019 Amdocs, Bell Canada -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -################################################################### -# This override file enables helm charts for all ONAP applications. -################################################################### -cassandra: - enabled: true -mariadb-galera: - enabled: true - -aaf: - enabled: true -aai: - enabled: true -appc: - enabled: true -cds: - enabled: true -clamp: - enabled: true -cli: - enabled: true -consul: - enabled: true -contrib: - enabled: true -dcaegen2: - enabled: true -dmaap: - enabled: true -esr: - enabled: true -log: - enabled: true -sniro-emulator: - enabled: true -oof: - enabled: true -msb: - enabled: true -multicloud: - enabled: true -nbi: - enabled: true -policy: - enabled: true -pomba: - enabled: true -portal: - enabled: true -robot: - enabled: true -sdc: - enabled: true -sdnc: - enabled: true -so: - enabled: true - so-monitoring: - 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: - enabled: true -vid: - enabled: true - ingress: - enabled: true - service: - - path: "/vid" - name: "vid-http" - port: 8080 - annotations: - nginx.ingress.kubernetes.io/ssl-redirect: "false" -vnfsdk: - enabled: true -nginx-ingress: - enabled: true - -- cgit 1.2.3-korg