From 7a42e7c3830e19abb9b6adedb2de783c73ffa29c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 25 Sep 2018 10:38:28 +0200 Subject: [PATCH] Add local override for ingress Without this patch it is not possible to have an override of the helm values for the ingress controllers. This is a problem, as this is inconsistent with other components and this has reduced flexibility. This patch solves the problem by exposing two extra overrides for ingress: $OSH_EXTRA_HELM_ARGS_INGRESS_ceph and $OSH_EXTRA_HELM_ARGS_INGRESS_openstack, next to the usual $OSH_EXTRA_HELM_ARGS Change-Id: I5b56941a6e9a585b9398099c632df349414112fa --- tools/deployment/multinode/020-ingress.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/deployment/multinode/020-ingress.sh b/tools/deployment/multinode/020-ingress.sh index 2d7733d6a1..9fc1f82fcc 100755 --- a/tools/deployment/multinode/020-ingress.sh +++ b/tools/deployment/multinode/020-ingress.sh @@ -42,6 +42,8 @@ helm status ingress-kube-system #NOTE: Deploy namespaced ingress controllers for NAMESPACE in openstack ceph; do + # Allow $OSH_EXTRA_HELM_ARGS_INGRESS_ceph and $OSH_EXTRA_HELM_ARGS_INGRESS_openstack overrides + OSH_EXTRA_HELM_ARGS_INGRESS_NAMESPACE="OSH_EXTRA_HELM_ARGS_INGRESS_${NAMESPACE}" #NOTE: Deploy namespace ingress tee /tmp/ingress-${NAMESPACE}.yaml << EOF pod: @@ -51,7 +53,9 @@ pod: EOF helm upgrade --install ingress-${NAMESPACE} ${OSH_INFRA_PATH}/ingress \ --namespace=${NAMESPACE} \ - --values=/tmp/ingress-${NAMESPACE}.yaml + --values=/tmp/ingress-${NAMESPACE}.yaml \ + ${OSH_EXTRA_HELM_ARGS} \ + ${!OSH_EXTRA_HELM_ARGS_INGRESS_NAMESPACE} #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ${NAMESPACE}