From 37764a610ae66b53ed6b40c9eb11f54187e5dde0 Mon Sep 17 00:00:00 2001 From: Mike Elliott Date: Fri, 23 Mar 2018 13:55:38 -0400 Subject: Enable all helm charts by default in parent chart This is as a means towards obsoleting the oneclick scripts from the Beijing release, in favour of directly using Helm. From this point on, users of onap should use the follow command: helm install local/onap -n onap --namespace onap Please refer to the official documentation for all the steps required to deploy onap. Currently as a patched to be merged: https://gerrit.onap.org/r/#/c/37871/ Change-Id: I75e5dbc9a79fec86a9b7c0cff487b10ec9df9a20 Issue-ID: OOM-816 Signed-off-by: Mike Elliott --- kubernetes/esr/Chart.yaml | 2 +- kubernetes/onap/requirements.yaml | 4 +- kubernetes/onap/resources/environments/dev.yaml | 117 +++++++++++++++++++++ .../onap/resources/environments/onap-demo.yaml | 74 ------------- kubernetes/onap/values.yaml | 42 ++++---- 5 files changed, 141 insertions(+), 98 deletions(-) create mode 100644 kubernetes/onap/resources/environments/dev.yaml delete mode 100644 kubernetes/onap/resources/environments/onap-demo.yaml diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml index 1de7295023..a80e6995b3 100644 --- a/kubernetes/esr/Chart.yaml +++ b/kubernetes/esr/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: A Helm chart for Kubernetes name: esr -version: v1.0.0 +version: 1.0.0 diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index 7b5e56b070..32f24703f8 100644 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -30,7 +30,7 @@ dependencies: repository: '@local' condition: appc.enabled - name: clamp - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: clamp.enabled - name: cli @@ -49,7 +49,7 @@ dependencies: repository: '@local' condition: dcaegen2.enabled - name: esr - version: ~1.1.0 + version: ~1.0.0 repository: '@local' condition: esr.enabled - name: log diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml new file mode 100644 index 0000000000..8bbaa279e8 --- /dev/null +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -0,0 +1,117 @@ +# 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'. +################################################################# +global: + # Change to an unused port prefix range to prevent port conflicts + # with other instances running within the same k8s cluster + nodePortPrefix: 302 + + # image repositories + repository: nexus3.onap.org:10001 + repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== + # readiness check + readinessRepository: oomk8s + # logging agent + loggingRepository: docker.elastic.co + + # image pull policy + pullPolicy: IfNotPresent + + # override default mount path root directory + # referenced by persistent volumes and log files + persistence: + mountPath: /dockerdata + + # flag to enable debugging - application support required + debugEnabled: 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: true +cli: + enabled: false +consul: # Consul Health Check Monitoring + enabled: false +dcaegen2: + enabled: false +esr: + enabled: false +log: + enabled: false +message-router: + enabled: false +mock: + enabled: false +msb: + enabled: false +multicloud: + enabled: false +policy: + enabled: false +portal: + enabled: false +robot: # Robot Health Check + enabled: true +sdc: + enabled: false +sdnc: + enabled: false +so: # Service Orchestrator + enabled: true + + replicaCount: 1 + + liveness: + # necessary to disable liveness probe when setting breakpoints + # in debugger so K8s doesn't restart unresponsive container + enabled: true + + # so server configuration + config: + # message router configuration + dmaapTopic: "AUTO" + # openstack configuration + openStackUserName: "vnf_user" + openStackRegion: "RegionOne" + openStackKeyStoneUrl: "http://1.2.3.4:5000" + openStackServiceTenantName: "service" + openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" + + # configure embedded mariadb + mariadb: + config: + mariadbRootPassword: password +uui: + enabled: false +vfc: + enabled: false +vid: + enabled: false +vnfsdk: + enabled: false \ No newline at end of file diff --git a/kubernetes/onap/resources/environments/onap-demo.yaml b/kubernetes/onap/resources/environments/onap-demo.yaml deleted file mode 100644 index 2748c3179e..0000000000 --- a/kubernetes/onap/resources/environments/onap-demo.yaml +++ /dev/null @@ -1,74 +0,0 @@ -# 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'. -################################################################# -global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster - nodePortPrefix: 302 - - # image repositories - repository: nexus3.onap.org:10001 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== - # readiness check - readinessRepository: oomk8s - # logging agent - loggingRepository: docker.elastic.co - - # image pull policy - pullPolicy: IfNotPresent - - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - mountPath: /dockerdata-nfs - - # flag to enable debugging - application support required - debugEnabled: true - -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the ONAP deployment. -################################################################# -consul: - enabled: true - -so: - enabled: true - replicaCount: 1 - liveness: - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: true - - # so server configuration - config: - # message router configuration - dmaapTopic: "AUTO" - # openstack configuration - openStackUserName: "vnf_user" - openStackRegion: "RegionOne" - openStackKeyStoneUrl: "http://1.2.3.4:5000" - openStackServiceTenantName: "service" - openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" - - # configure embedded mariadb - mariadb: - config: - mariadbRootPassword: password \ No newline at end of file diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index be4d132b7e..0c3ff8526d 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -48,41 +48,41 @@ global: # to customize the ONAP deployment. ################################################################# aaf: - enabled: false + enabled: true aai: - enabled: false + enabled: true appc: - enabled: false + enabled: true clamp: - enabled: false + enabled: true cli: - enabled: false + enabled: true consul: # Consul Health Check Monitoring - enabled: false + enabled: true dcaegen2: - enabled: false + enabled: true esr: - enabled: false + enabled: true log: - enabled: false + enabled: true message-router: - enabled: false + enabled: true mock: - enabled: false + enabled: true msb: - enabled: false + enabled: true multicloud: - enabled: false + enabled: true policy: - enabled: false + enabled: true portal: - enabled: false + enabled: true robot: # Robot Health Check enabled: true sdc: - enabled: false + enabled: true sdnc: - enabled: false + enabled: true so: # Service Orchestrator enabled: true @@ -109,10 +109,10 @@ so: # Service Orchestrator config: mariadbRootPassword: password uui: - enabled: false + enabled: true vfc: - enabled: false + enabled: true vid: - enabled: false + enabled: true vnfsdk: - enabled: false + enabled: true -- cgit 1.2.3-korg