openstack/openstack-helm
Code Issues Proposed changes

Add local override for ingress

Browse Source 
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
This commit is contained in:
Jean-Philippe Evrard 2018-09-25 10:38:28 +02:00
parent e633b33e78
commit 7a42e7c383
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/deployment/multinode/020-ingress.sh
View File

@ -42,6 +42,8 @@ helm status ingress-kube-system
#NOTE: Deploy namespaced ingress controllers #NOTE: Deploy namespaced ingress controllers
for NAMESPACE in openstack ceph; do 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 #NOTE: Deploy namespace ingress
tee /tmp/ingress-${NAMESPACE}.yaml << EOF tee /tmp/ingress-${NAMESPACE}.yaml << EOF
pod: pod:
@ -51,7 +53,9 @@ pod:
EOF EOF
helm upgrade --install ingress-${NAMESPACE} ${OSH_INFRA_PATH}/ingress \ helm upgrade --install ingress-${NAMESPACE} ${OSH_INFRA_PATH}/ingress \
--namespace=${NAMESPACE} \ --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 #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ${NAMESPACE} ./tools/deployment/common/wait-for-pods.sh ${NAMESPACE}