On GCI, remove kubelet cgroup overrides and override host kubectl with that of the release

Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan 2016-10-21 11:14:04 -07:00
parent 6bda989d54
commit f6f4f91ae7

View File

@ -473,8 +473,6 @@ function start-kubelet {
flags+=" --cluster-dns=${DNS_SERVER_IP}"
flags+=" --cluster-domain=${DNS_DOMAIN}"
flags+=" --config=/etc/kubernetes/manifests"
flags+=" --kubelet-cgroups=/kubelet"
flags+=" --system-cgroups=/system"
if [[ -n "${KUBELET_PORT:-}" ]]; then
flags+=" --port=${KUBELET_PORT}"
@ -1167,6 +1165,9 @@ For Kubernetes copyright and licensing information, see:
EOF
}
function override-kubectl {
echo "export PATH=${KUBE_HOME}/bin:\$PATH" > /etc/profile.d/kube_env.sh
}
########### Main Function ###########
echo "Start to configure instance for kubernetes"
@ -1201,6 +1202,7 @@ else
create-kubeproxy-kubeconfig
fi
override-kubectl
assemble-docker-flags
load-docker-images
start-kubelet