From 00f518fc59fff311603eb9f6536ca71cfa22f31e Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Wed, 28 Aug 2019 11:56:35 +0200 Subject: [PATCH] Take kubeproxy_options into account on proxy setup The label kubeproxy_options was being ignored when setting up both master and minions. Add it to the kube proxy args. Change-Id: Ic830f19e1af062e90d066e6df4df2e4376e4f379 Story: 2006465 Task: 36394 --- .../kubernetes/fragments/configure-kubernetes-master.sh | 1 + .../kubernetes/fragments/configure-kubernetes-minion.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index 69c3ff7a7c..687f3dfa95 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -62,6 +62,7 @@ CERT_DIR=/etc/kubernetes/certs PROXY_KUBECONFIG=/etc/kubernetes/proxy-kubeconfig.yaml cat > /etc/kubernetes/proxy << EOF KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}" +KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}" EOF cat > ${PROXY_KUBECONFIG} << EOF diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index 52bb20dba5..340151688d 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -202,8 +202,9 @@ sed -i ' cat > /etc/kubernetes/proxy << EOF KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}" +KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}" EOF cat >> /etc/environment <