github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/gci/configure-helper.sh
View File

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