Browse Source

Merge "Trivial fix for cluster creation in master"

changes/88/667088/3
Zuul 3 years ago committed by Gerrit Code Review
parent
commit
6fe3d5d7f1
  1. 2
      magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
  2. 2
      magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

@ -60,8 +60,8 @@ CERT_DIR=/etc/kubernetes/certs
# kube-proxy config
PROXY_KUBECONFIG=/etc/kubernetes/proxy-kubeconfig.yaml
cat > /etc/kubernetes/proxy << EOF
KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
cat > /etc/kubernetes/proxy << EOF
KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
EOF

2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

@ -200,8 +200,8 @@ sed -i '
/^KUBELET_ARGS=/ s|=.*|="'"\$(/etc/kubernetes/get_require_kubeconfig.sh) ${KUBELET_ARGS}"'"|
' /etc/kubernetes/kubelet
cat > /etc/kubernetes/proxy << EOF
KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
cat > /etc/kubernetes/proxy << EOF
KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
EOF

Loading…
Cancel
Save