Skip to content

K
k3s
Commit cba0c6fb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #33345 from vishh/fix-noexec

Automatic merge from submit-queue Mount kubelet root directory as executable in GCI Fixes #33315 and #33318 This PR is isolated to GCI distro. Without this rather simple patch, PetSets won't work with GCI. Hence requesting a cherry-pick.
parents 430b897f 504cf5ca
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
cluster/gce/gci/configure-helper.sh
View file @ cba0c6fb
......@@ -1120,6 +1120,13 @@ function start-rescheduler {
fi
}
# Setup working directory for kubelet.
function setup-kubelet-dir {
echo "Making /var/lib/kubelet executable for kubelet"
mount --bind /var/lib/kubelet /var/lib/kubelet/
mount -B -o remount,exec,suid,dev /var/lib/kubelet
}
function reset-motd {
# kubelet is installed both on the master and nodes, and the version is easy to parse (unlike kubectl)
local -r version="$("${KUBE_HOME}"/bin/kubelet --version=true | cut -f2 -d " ")"
......@@ -1177,6 +1184,7 @@ fi
config-ip-firewall
create-dirs
setup-kubelet-dir
ensure-local-ssds
setup-logrotate
if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment