diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/onap/requirements.yaml | 46 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/dev.yaml | 33 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/disable-allcharts.yaml | 75 | ||||
| -rw-r--r-- | kubernetes/onap/templates/secrets.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/values.yaml | 47 |
6 files changed, 161 insertions, 45 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index 1050e1a38b..928399dfb0 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -21,3 +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" diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index c3690cc210..97bcea47b0 100644 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -18,7 +18,7 @@ # > helm repo add local http://127.0.0.1:8879 dependencies: - name: aaf - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: aaf.enabled - name: aai @@ -34,62 +34,66 @@ dependencies: repository: '@local' condition: clamp.enabled - name: cli - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: cli.enabled - name: common version: ~2.0.0 repository: '@local' - name: consul - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: consul.enabled - name: dcaegen2 - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: dcaegen2.enabled + - name: dmaap + version: ~2.0.0 + repository: '@local' + condition: dmaap.enabled - name: esr - version: ~1.0.0 + version: ~2.0.0 repository: '@local' condition: esr.enabled - name: log version: ~2.0.0 repository: '@local' condition: log.enabled - - name: message-router - version: ~0.1.0 - repository: '@local' - condition: message-router.enabled - - name: mock - version: ~0.1.0 + - name: sniro-emulator + version: ~2.0.0 repository: '@local' - condition: mock.enabled + condition: sniro-emulator.enabled - name: msb version: ~2.0.0 repository: '@local' condition: msb.enabled - name: multicloud - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: multicloud.enabled - name: policy - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: policy.enabled - name: portal - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: portal.enabled + - name: oof + version: ~2.0.0 + repository: '@local' + condition: oof.enabled - name: robot version: ~2.0.0 repository: '@local' condition: robot.enabled - name: sdc - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: sdc.enabled - name: sdnc - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: sdnc.enabled - name: so @@ -97,18 +101,18 @@ dependencies: repository: '@local' condition: so.enabled - name: uui - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: uui.enabled - name: vfc - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: vfc.enabled - name: vid - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: vid.enabled - name: vnfsdk - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: vnfsdk.enabled diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml index 8bbaa279e8..9b10012879 100644 --- a/kubernetes/onap/resources/environments/dev.yaml +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -23,12 +23,16 @@ global: # with other instances running within the same k8s cluster nodePortPrefix: 302 - # image repositories - repository: nexus3.onap.org:10001 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== - # readiness check + # ONAP Repository + # Uncomment the following to enable the use of a single docker + # repository but ONLY if your repository mirrors all ONAP + # docker images. This includes all images from dockerhub and + # any other repository that hosts images for ONAP components. + #repository: nexus3.onap.org:10001 + + # readiness check - temporary repo until images migrated to nexus3 readinessRepository: oomk8s - # logging agent + # logging agent - temporary repo until images migrated to nexus3 loggingRepository: docker.elastic.co # image pull policy @@ -56,17 +60,19 @@ clamp: enabled: true cli: enabled: false -consul: # Consul Health Check Monitoring +consul: enabled: false dcaegen2: enabled: false +dmaap: + enabled: false esr: enabled: false log: enabled: false -message-router: +sniro-emulator: enabled: false -mock: +oof: enabled: false msb: enabled: false @@ -76,13 +82,18 @@ policy: enabled: false portal: enabled: false -robot: # Robot Health Check +robot: enabled: true sdc: enabled: false sdnc: enabled: false -so: # Service Orchestrator + + replicaCount: 1 + + mysql: + replicaCount: 1 +so: enabled: true replicaCount: 1 @@ -114,4 +125,4 @@ vfc: vid: enabled: false vnfsdk: - enabled: false
\ No newline at end of file + enabled: false diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml new file mode 100644 index 0000000000..0f669beaab --- /dev/null +++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml @@ -0,0 +1,75 @@ +# 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. + + +# This override file is useful to test one or more subcharts. +# It overrides the default ONAP parent chart behaviour to deploy +# all of ONAP. +# +# Example use to enable a single subchart (from this directory): +# +# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true + +################################################################# +# Enable/disable and configure helm charts (ie. applications) +# to customize the ONAP deployment. +################################################################# +aaf: + enabled: false +aai: + enabled: false +appc: + enabled: false +clamp: + enabled: false +cli: + enabled: false +consul: + enabled: false +dcaegen2: + enabled: false +dmaap: + enabled: false +esr: + enabled: false +log: + enabled: false +sniro-emulator: + enabled: false +msb: + enabled: false +multicloud: + enabled: false +oof: + enabled: false +policy: + enabled: false +portal: + enabled: false +robot: + enabled: false +sdc: + enabled: false +sdnc: + enabled: false +so: + enabled: false +uui: + enabled: false +vfc: + enabled: false +vid: + enabled: false +vnfsdk: + enabled: false diff --git a/kubernetes/onap/templates/secrets.yaml b/kubernetes/onap/templates/secrets.yaml index 2345be1972..145b55f36d 100644 --- a/kubernetes/onap/templates/secrets.yaml +++ b/kubernetes/onap/templates/secrets.yaml @@ -23,5 +23,5 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - .dockercfg: {{ .Values.global.repositorySecret | default .Values.repositorySecret }} -type: kubernetes.io/dockercfg
\ No newline at end of file + .dockercfg: {{ include "common.repository.secret" . }} +type: kubernetes.io/dockercfg diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index ee7d00b441..c5a56aa715 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -23,12 +23,19 @@ global: # with other instances running within the same k8s cluster nodePortPrefix: 302 - # image repositories - repository: nexus3.onap.org:10001 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== - # readiness check + # ONAP Repository + # Uncomment the following to enable the use of a single docker + # repository but ONLY if your repository mirrors all ONAP + # docker images. This includes all images from dockerhub and + # any other repository that hosts images for ONAP components. + #repository: nexus3.onap.org:10001 + repositoryCred: + user: docker + password: docker + + # readiness check - temporary repo until images migrated to nexus3 readinessRepository: oomk8s - # logging agent + # logging agent - temporary repo until images migrated to nexus3 loggingRepository: docker.elastic.co # image pull policy @@ -42,6 +49,9 @@ global: # flag to enable debugging - application support required debugEnabled: false +# Repository for creation of nexus3.onap.org secret +repository: nexus3.onap.org:10001 + ################################################################# # Enable/disable and configure helm charts (ie. applications) @@ -53,21 +63,31 @@ aai: enabled: true appc: enabled: true + config: + openStackType: OpenStackProvider + openStackName: OpenStack + openStackKeyStoneUrl: http://localhost:8181/apidoc/explorer/index.html + openStackServiceTenantName: default + openStackDomain: default + openStackUserName: admin + openStackEncryptedPassword: admin clamp: enabled: true cli: enabled: true -consul: # Consul Health Check Monitoring +consul: enabled: true dcaegen2: enabled: true +dmaap: + enabled: true esr: enabled: true -log: # ONAP Logging ElasticStack +log: enabled: true -message-router: +sniro-emulator: enabled: true -mock: +oof: enabled: true msb: enabled: true @@ -77,13 +97,18 @@ policy: enabled: true portal: enabled: true -robot: # Robot Health Check +robot: enabled: true sdc: enabled: true sdnc: enabled: true -so: # Service Orchestrator + + replicaCount: 1 + + mysql: + replicaCount: 1 +so: enabled: true replicaCount: 1 |