diff --git a/core/nodepool/config/templates/cloud-config-worker b/core/nodepool/config/templates/cloud-config-worker index d22096731..052897d8c 100644 --- a/core/nodepool/config/templates/cloud-config-worker +++ b/core/nodepool/config/templates/cloud-config-worker @@ -342,13 +342,13 @@ coreos: ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/usr/bin/mkdir -p /var/run/calico ExecStartPre=/usr/bin/mkdir -p /var/lib/calico - ExecStart=/usr/lib/coreos/kubelet-wrapper \ + ExecStart=/bin/sh -c "exec /usr/lib/coreos/kubelet-wrapper \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ {{/* Work-around until https://github.com/kubernetes/kubernetes/issues/43967 is fixed via https://github.com/kubernetes/kubernetes/pull/43995 */ -}} --cni-bin-dir=/opt/cni/bin \ --network-plugin={{.K8sNetworkPlugin}} \ --container-runtime={{.ContainerRuntime}} \ - --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node="",node-role.kubernetes.io/{{ toLabel .NodePoolName }}=""{{if .NodeLabels.Enabled}},{{.NodeLabels.String}}{{end}} \ + --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node=\"\",node-role.kubernetes.io/{{ toLabel .NodePoolName }}=\"\"{{if .NodeLabels.Enabled}},{{.NodeLabels.String}}{{end}} \ --register-node=true \ {{if .Taints}}--register-with-taints={{.Taints.String}}\ {{end}}--allow-privileged=true \ @@ -370,7 +370,7 @@ coreos: {{- end }} --kubeconfig=/etc/kubernetes/kubeconfig/worker.yaml \ {{- if .FeatureGates.Enabled }} - --feature-gates="{{.FeatureGates.String}}" \ + --feature-gates=\"{{.FeatureGates.String}}\" \ {{- end }} {{- if .Kubelet.SystemReservedResources }} --system-reserved={{ .Kubelet.SystemReservedResources }} \ @@ -385,7 +385,7 @@ coreos: {{if checkVersion "<1.10" .K8sVer -}} --require-kubeconfig \ {{end -}} - $KUBELET_OPTS + $KUBELET_OPTS" Restart=always RestartSec=10 [Install]