From fe111116be4128a9fb90d175c38e0aa955e7e33f Mon Sep 17 00:00:00 2001 From: Samuli Silvius Date: Tue, 5 Feb 2019 09:45:24 +0200 Subject: Helm install optional and default values Make Helm applicaton installation optional by allowing user not to provide Helm charts. Then only empty Kubernetes cluster will be installed. Provide some reasonable default values for Helm charts configuration variables both in package script and ansible installer itself. User provided Helm charts configuration must be in sync with packaging and installer, provided some clarifying comments for that. Issue-ID: OOM-1629 Change-Id: Ica9fc76856cb50c9d636bea99a326736736c7a56 Signed-off-by: Samuli Silvius --- build/package.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'build/package.sh') diff --git a/build/package.sh b/build/package.sh index fd9b9e75..89764ccf 100755 --- a/build/package.sh +++ b/build/package.sh @@ -109,8 +109,8 @@ function create_sw_package { then echo "Helm charts handling" # Copy charts available for ansible playbook to use/move them to target server/dir - mkdir -p "${pkg_root}"/ansible/application/helm_charts - cp -r "${HELM_CHARTS_DIR}"/* "${pkg_root}"/ansible/application/helm_charts + mkdir -p ${pkg_root}/${HELM_CHARTS_DIR_IN_PACKAGE} + cp -r "${HELM_CHARTS_DIR}"/* ${pkg_root}/${HELM_CHARTS_DIR_IN_PACKAGE} fi # Add metadata to the package @@ -192,6 +192,17 @@ TIMESTAMP=$(date -u +%Y%m%dT%H%M%S) SCRIPT_DIR=$(dirname "${0}") LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") +# Relative location inside the package to place Helm charts to be available for +# Ansible process to transfer them into machine (infra node) running Helm repository. +# NOTE: This is quite hardcoded place to put them and agreement with Ansible code +# is done in ansible/group_vars/all.yml with variable "app_helm_charts_install_directory" +# whihc value must match to value of this variable (with exception of slash '/' +# prepended so that ansible docker/chroot process can see the dir). +# This variable can be of course changed in package.conf if really needed if +# corresponding ansible variable "app_helm_charts_install_directory" value +# adjusted accordingly. +HELM_CHARTS_DIR_IN_PACKAGE="ansible/application/helm_charts" + if [ "$#" -lt 3 ]; then echo "Missing some mandatory parameter!" usage -- cgit 1.2.3-korg