Browse Source

Merge "Trivial fix for cluster creation in master"

changes/88/667088/3
Zuul 1 week ago
parent
commit
6fe3d5d7f1

+ 1
- 1
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh View File

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

+ 1
- 1
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh View File

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

Loading…
Cancel
Save