From ac281bd0798ae7308402f4d19d537546d101afba Mon Sep 17 00:00:00 2001 From: Mike Elliott Date: Sat, 2 Mar 2019 09:46:25 -0500 Subject: [PATCH] Improve override usability Currently when you deploy onap with no override file, the behavior is to deploy everything. In order to deploy a subset of components, an override file must contain all components and then disable the ones you don't want. As we prepare to transfer helm chart ownership to the teams, it will simplify the creation of project specific development override files, if the default behavior for deploying onap was reversed. Allowing override files to only contain the components they care to enable (and configure) and ignore the rest as they would be disabled by default. From this point on, it will be necessary to use an override file (as integration uses for testing) to enable all components. This patch includes an onap-all.yaml override file that may be used for this purpose. helm deploy dev local/onap -f onap/overrides/onap-all.yaml No configuration is part of this override. Its purpose is only to enable the components and is intended to be used in combination with other override files that provide environment specific configuration. Change-Id: I4b74a3a8a35a178298af7205762e2aca7c65dda3 Issue-ID: OOM-1692 Signed-off-by: Mike Elliott --- kubernetes/onap/resources/overrides/onap-all.yaml | 73 +++++++++++++++++++++++ kubernetes/onap/values.yaml | 58 +++++++++--------- 2 files changed, 102 insertions(+), 29 deletions(-) create mode 100644 kubernetes/onap/resources/overrides/onap-all.yaml diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml new file mode 100644 index 0000000000..9f9f166e91 --- /dev/null +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -0,0 +1,73 @@ +# 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. +################################################################### +aaf: + enabled: true +aai: + enabled: true +appc: + enabled: true +cassandra: + 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 +vnfsdk: + enabled: true diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 20e8b77c6e..81a1fe24ac 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -58,11 +58,11 @@ global: # to customize the ONAP deployment. ################################################################# aaf: - enabled: true + enabled: false aai: - enabled: true + enabled: false appc: - enabled: true + enabled: false config: openStackType: OpenStackProvider openStackName: OpenStack @@ -72,68 +72,68 @@ appc: openStackUserName: admin openStackEncryptedPassword: admin cassandra: - enabled: true + enabled: false clamp: - enabled: true + enabled: false cli: - enabled: true + enabled: false consul: - enabled: true + enabled: false contrib: - enabled: true + enabled: false dcaegen2: - enabled: true + enabled: false pnda: enabled: false dmaap: - enabled: true + enabled: false esr: - enabled: true + enabled: false log: - enabled: true + enabled: false sniro-emulator: - enabled: true + enabled: false oof: - enabled: true + enabled: false msb: - enabled: true + enabled: false multicloud: - enabled: true + enabled: false nbi: - enabled: true + enabled: false config: # openstack configuration openStackRegion: "Yolo" openStackVNFTenantId: "1234" policy: - enabled: true + enabled: false pomba: - enabled: true + enabled: false portal: - enabled: true + enabled: false robot: - enabled: true + enabled: false config: # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" sdc: - enabled: true + enabled: false sdnc: - enabled: true + enabled: false replicaCount: 1 mysql: replicaCount: 1 so: - enabled: true + enabled: false replicaCount: 1 liveness: # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container - enabled: true + enabled: false # so server configuration config: @@ -151,10 +151,10 @@ so: config: mariadbRootPassword: password uui: - enabled: true + enabled: false vfc: - enabled: true + enabled: false vid: - enabled: true + enabled: false vnfsdk: - enabled: true + enabled: false -- 2.16.6