From e2f87f69ab80bbc94368e7934f0b6f3e8b4c5a49 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Tue, 16 Jan 2018 10:58:36 -0500 Subject: [PATCH] setKubeletOpts to work better with kubeconfig Signed-off-by: Jess Frazelle --- parts/k8s/artifacts/kuberneteskubelet.service | 2 +- parts/k8s/kubernetesagentcustomdata.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/parts/k8s/artifacts/kuberneteskubelet.service b/parts/k8s/artifacts/kuberneteskubelet.service index a437e56565..9c87c98d77 100644 --- a/parts/k8s/artifacts/kuberneteskubelet.service +++ b/parts/k8s/artifacts/kuberneteskubelet.service @@ -40,7 +40,7 @@ ExecStart=/usr/bin/docker run \ --v=2 ${KUBELET_FEATURE_GATES} \ --non-masquerade-cidr=${KUBELET_NON_MASQUERADE_CIDR} \ --volume-plugin-dir=/etc/kubernetes/volumeplugins \ - $KUBELET_CONFIG \ + $KUBELET_CONFIG $KUBELET_OPTS \ ${KUBELET_REGISTER_NODE} ${KUBELET_REGISTER_WITH_TAINTS} [Install] diff --git a/parts/k8s/kubernetesagentcustomdata.yml b/parts/k8s/kubernetesagentcustomdata.yml index 629a5b8dc8..5440aa892d 100644 --- a/parts/k8s/kubernetesagentcustomdata.yml +++ b/parts/k8s/kubernetesagentcustomdata.yml @@ -106,6 +106,7 @@ write_files: KUBELET_CONFIG={{GetKubeletConfigKeyVals .KubernetesConfig }} KUBELET_IMAGE={{WrapAsVariable "kubernetesHyperkubeSpec"}} DOCKER_OPTS= + KUBELET_OPTS= KUBELET_REGISTER_SCHEDULABLE=true KUBELET_NODE_LABELS={{GetAgentKubernetesLabels . "',variables('labelResourceGroup'),'"}} {{if IsKubernetesVersionGe "1.6.0"}}