diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | kubernetes/onap/requirements.yaml | 70 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/public-cloud.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/environment.yaml | 225 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml | 80 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all.yaml | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | kubernetes/onap/values.yaml | 2 |
7 files changed, 350 insertions, 37 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index 82228a8b10..fa2ed65617 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -14,10 +14,10 @@ apiVersion: v1 name: onap -version: 4.0.0 -appVersion: Dublin +version: 5.0.0 +appVersion: El Alto description: Open Network Automation Platform (ONAP) home: https://www.onap.org/ sources: - https://gerrit.onap.org/r/#/admin/projects/ -icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
\ No newline at end of file +icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2 diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index c267eaa021..5dd51a006b 100644..100755 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -18,133 +18,137 @@ # > helm repo add local http://127.0.0.1:8879 dependencies: - name: aaf - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: aaf.enabled - name: aai - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: aai.enabled - name: appc - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: appc.enabled - name: cassandra - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: cassandra.enabled - name: clamp - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: clamp.enabled - name: cli - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: cli.enabled - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local' - name: consul - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: consul.enabled - name: contrib - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: contrib.enabled - name: dcaegen2 - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: dcaegen2.enabled - name: dmaap - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: dmaap.enabled - name: esr - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: esr.enabled - name: log - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: log.enabled - name: sniro-emulator - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: sniro-emulator.enabled - name: mariadb-galera - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: mariadb-galera.enabled - name: msb - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: msb.enabled - name: multicloud - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: multicloud.enabled - name: nbi - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: nbi.enabled - name: nfs-provisioner - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: nfs-provisioner.enabled - name: pnda - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: pnda.enabled - name: policy - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: policy.enabled - name: pomba - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: pomba.enabled - name: portal - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: portal.enabled - name: oof - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: oof.enabled - name: robot - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: robot.enabled - name: sdc - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: sdc.enabled - name: sdnc - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: sdnc.enabled - name: so - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: so.enabled - name: uui - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: uui.enabled - name: vfc - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: vfc.enabled - name: vid - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: vid.enabled - name: vnfsdk - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: vnfsdk.enabled - name: modeling - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: modeling.enabled + - name: nginx-ingress + version: ~1.6.18 + repository: 'https://kubernetes-charts.storage.googleapis.com' + condition: nginx-ingress.enabled diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml index d751534bd9..2d4360c579 100644 --- a/kubernetes/onap/resources/environments/public-cloud.yaml +++ b/kubernetes/onap/resources/environments/public-cloud.yaml @@ -141,7 +141,7 @@ sdnc: so: liveness: initialDelaySeconds: 120 - mariadb: + so-mariadb: liveness: initialDelaySeconds: 900 readiness: diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml new file mode 100644 index 0000000000..75ce8e529b --- /dev/null +++ b/kubernetes/onap/resources/overrides/environment.yaml @@ -0,0 +1,225 @@ +# Copyright © 2017,2019 Amdocs, AT&T , 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. + +################################################################# +# +# These overrides will affect all helm charts (ie. applications) +# that are listed below and are 'enabled'. +# +# +# This is specifically for the environments which take time to +# deploy ONAP. This increase in timeouts prevents false restarting of +# the pods during startup configuration. +# +# These timers have been tuned by the ONAP integration team. They +# have been tested and validated in the ONAP integration lab (Intel/Windriver lab). +# They are however indicative and may be adapted to your environment as they +# depend on the performance of the infrastructure you are installing ONAP on. +# +# Please note that these timers must remain reasonable, in other words, if +# your infrastructure is not performant enough, extending the timers to very +# large value may not fix all installation issues on over subscribed hardware. +# +################################################################# +aaf: + aaf-cs: + liveness: + initialDelaySeconds: 240 + readiness: + initialDelaySeconds: 240 + aaf-gui: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + aaf-oauth: + liveness: + initialDelaySeconds: 300 + readiness: + initialDelaySeconds: 300 + aaf-service: + liveness: + initialDelaySeconds: 300 + readiness: + initialDelaySeconds: 300 +aai: + liveness: + initialDelaySeconds: 120 + aai-champ: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + aai-data-router: + liveness: + initialDelaySeconds: 120 + aai-sparky-be: + liveness: + initialDelaySeconds: 120 + aai-spike: + liveness: + initialDelaySeconds: 120 + aai-cassandra: + liveness: + periodSeconds: 120 + readiness: + periodSeconds: 60 +appc: + mariadb-galera: + liveness: + initialDelaySeconds: 180 + periodSeconds: 60 +cassandra: + liveness: + initialDelaySeconds: 120 + periodSeconds: 120 + readiness: + initialDelaySeconds: 120 + periodSeconds: 60 +clamp: + liveness: + initialDelaySeconds: 60 + readiness: + initialDelaySeconds: 60 +dcaegen2: + dcae-cloudify-manager: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 +dmaap: + dmaap-bus-controller: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + message-router: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + dmaap-dr-prov: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + mariadb: + liveness: + initialDelaySeconds: 180 + periodSeconds: 60 + dmaap-dr-node: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 +mariadb-galera: + liveness: + initialDelaySeconds: 180 + periodSeconds: 60 + mariadb-galera-server: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 +modeling: + mariadb-galera: + liveness: + initialDelaySeconds: 180 + periodSeconds: 60 +oof: + oof-has: + music: + music-cassandra: + liveness: + periodSeconds: 120 + readiness: + periodSeconds: 60 +portal: + portal-app: + liveness: + initialDelaySeconds: 60 + readiness: + initialDelaySeconds: 60 + portal-cassandra: + liveness: + periodSeconds: 120 + readiness: + periodSeconds: 60 +sdc: + sdc-be: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + sdc-cs: + liveness: + initialDelaySeconds: 120 + periodSeconds: 120 + readiness: + initialDelaySeconds: 120 + periodSeconds: 60 + sdc-es: + liveness: + initialDelaySeconds: 60 + readiness: + initialDelaySeconds: 120 + sdc-onboarding-be: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 +sdnc: + liveness: + initialDelaySeconds: 60 + readiness: + initialDelaySeconds: 60 + dmaap-listener: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + mariadb-galera: + liveness: + initialDelaySeconds: 180 + periodSeconds: 60 + sdnc-ansible-server: + readiness: + initialDelaySeconds: 120 + sdnc-portal: + readiness: + initialDelaySeconds: 120 + ueb-listener: + liveness: + initialDelaySeconds: 60 + readiness: + initialDelaySeconds: 60 +so: + liveness: + initialDelaySeconds: 120 + mariadb: + liveness: + initialDelaySeconds: 900 + readiness: + initialDelaySeconds: 900 +uui: + uui-server: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 +vfc: + mariadb-galera: + liveness: + initialDelaySeconds: 180 + periodSeconds: 60 diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml new file mode 100644 index 0000000000..ee27269564 --- /dev/null +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml @@ -0,0 +1,80 @@ +# 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 +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 +uui: + enabled: true +vfc: + enabled: true +vid: + enabled: true + ingress: + enabled: true +vnfsdk: + enabled: true +nginx-ingress: + enabled: true diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml index 1716415b3e..04fbc97f54 100644 --- a/kubernetes/onap/resources/overrides/onap-all.yaml +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -74,3 +74,5 @@ vid: enabled: true vnfsdk: enabled: true +modeling: + enabled: true diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index c0095049b5..46c8db6e5e 100644..100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -168,3 +168,5 @@ vnfsdk: enabled: false modeling: enabled: false +nginx-ingress: + enabled: false |