Merge "Trivial fix for cluster creation in master"
This commit is contained in:
commit
6fe3d5d7f1
|
@ -60,8 +60,8 @@ CERT_DIR=/etc/kubernetes/certs
|
||||||
|
|
||||||
# kube-proxy config
|
# kube-proxy config
|
||||||
PROXY_KUBECONFIG=/etc/kubernetes/proxy-kubeconfig.yaml
|
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="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
|
||||||
|
cat > /etc/kubernetes/proxy << EOF
|
||||||
KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
|
KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -200,8 +200,8 @@ sed -i '
|
||||||
/^KUBELET_ARGS=/ s|=.*|="'"\$(/etc/kubernetes/get_require_kubeconfig.sh) ${KUBELET_ARGS}"'"|
|
/^KUBELET_ARGS=/ s|=.*|="'"\$(/etc/kubernetes/get_require_kubeconfig.sh) ${KUBELET_ARGS}"'"|
|
||||||
' /etc/kubernetes/kubelet
|
' /etc/kubernetes/kubelet
|
||||||
|
|
||||||
cat > /etc/kubernetes/proxy << EOF
|
|
||||||
KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
|
KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
|
||||||
|
cat > /etc/kubernetes/proxy << EOF
|
||||||
KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
|
KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue