Skip to content

Commit

Permalink
On GCI, remove kubelet cgroup overrides and override host kubectl wit…
Browse files Browse the repository at this point in the history
…h that of the release

Signed-off-by: Vishnu kannan <vishnuk@google.com>
  • Loading branch information
vishh authored and jessfraz committed Oct 28, 2016
1 parent 19d90ce commit 070b556
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -1170,6 +1168,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"
Expand Down Expand Up @@ -1204,6 +1205,7 @@ else
create-kubeproxy-kubeconfig
fi

override-kubectl
assemble-docker-flags
load-docker-images
start-kubelet
Expand Down

0 comments on commit 070b556

Please sign in to comment.