diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/requirements.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/disable-allcharts.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/public-cloud.yaml | 139 | ||||
| -rw-r--r-- | kubernetes/onap/values.yaml | 2 |
5 files changed, 148 insertions, 1 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index 928399dfb0..bdc201dab8 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -21,4 +21,4 @@ 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 -tillerVersion: "~2.8.2" +tillerVersion: "~2.9.1" diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index d28f16b3d8..911a1d55f9 100644 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -80,6 +80,10 @@ dependencies: version: ~2.0.0 repository: '@local' condition: policy.enabled + - name: pomba + version: ~2.0.0 + repository: '@local' + condition: pomba.enabled - name: portal version: ~2.0.0 repository: '@local' diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml index 8b66dab319..1cf1ab1b37 100644 --- a/kubernetes/onap/resources/environments/disable-allcharts.yaml +++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml @@ -57,6 +57,8 @@ oof: enabled: false policy: enabled: false +pomba: + enabled: false portal: enabled: false robot: diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml new file mode 100644 index 0000000000..35c164218d --- /dev/null +++ b/kubernetes/onap/resources/environments/public-cloud.yaml @@ -0,0 +1,139 @@ +# Copyright © 2017 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. + +################################################################# +# Global configuration overrides. +# +# 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 restarting of +# the pods thereby the components will be deployed without error. +################################################################# +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: + aai-champ: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 +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 +portal: + portal-app: + liveness: + initialDelaySeconds: 60 + readiness: + initialDelaySeconds: 60 +sdc: + sdc-be: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + sdc-cs: + liveness: + initialDelaySeconds: 120 + readiness: + initialDelaySeconds: 120 + 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 + 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 diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index b8f15e17ea..eba5dcf7d0 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -101,6 +101,8 @@ nbi: openStackVNFTenantId: "1234" policy: enabled: true +pomba: + enabled: true portal: enabled: true robot: |