Commit f64780d6 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #16526 from aveshagarwal/master-selinux-issue-with-local-up-cluster

Auto commit by PR queue bot
parents 75ecc344 c113737a
...@@ -253,7 +253,22 @@ function start_controller_manager { ...@@ -253,7 +253,22 @@ function start_controller_manager {
function start_kubelet { function start_kubelet {
KUBELET_LOG=/tmp/kubelet.log KUBELET_LOG=/tmp/kubelet.log
mkdir -p /var/lib/kubelet
if [[ -z "${DOCKERIZE_KUBELET}" ]]; then if [[ -z "${DOCKERIZE_KUBELET}" ]]; then
# On selinux enabled systems, it might
# require to relabel /var/lib/kubelet
if which selinuxenabled &> /dev/null && \
selinuxenabled && \
which chcon > /dev/null ; then
if [[ ! $(ls -Zd /var/lib/kubelet) =~ system_u:object_r:svirt_sandbox_file_t:s0 ]] ; then
echo "Applying SELinux label to /var/lib/kubelet directory."
if ! chcon -R system_u:object_r:svirt_sandbox_file_t:s0 /var/lib/kubelet; then
echo "Failed to apply selinux label to /var/lib/kubelet."
fi
fi
fi
sudo -E "${GO_OUT}/kubelet" ${priv_arg}\ sudo -E "${GO_OUT}/kubelet" ${priv_arg}\
--v=${LOG_LEVEL} \ --v=${LOG_LEVEL} \
--chaos-chance="${CHAOS_CHANCE}" \ --chaos-chance="${CHAOS_CHANCE}" \
...@@ -277,7 +292,7 @@ function start_kubelet { ...@@ -277,7 +292,7 @@ function start_kubelet {
--volume=/var/run:/var/run:rw \ --volume=/var/run:/var/run:rw \
--volume=/sys:/sys:ro \ --volume=/sys:/sys:ro \
--volume=/var/lib/docker/:/var/lib/docker:ro \ --volume=/var/lib/docker/:/var/lib/docker:ro \
--volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ --volume=/var/lib/kubelet/:/var/lib/kubelet:rw,z \
--net=host \ --net=host \
--privileged=true \ --privileged=true \
-i \ -i \
......
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