From 38f6f9b95607b070ee99fbf514b17aa5d9a4e567 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Mon, 24 Oct 2016 12:23:38 -0400 Subject: [PATCH] Remove SELinux relabel of Kubelet dir from local-up-cluster.sh --- hack/local-up-cluster.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 6d71f15328e..c4e95698f92 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -418,18 +418,6 @@ function start_kubelet { mkdir -p /var/lib/kubelet 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 ! sudo chcon -Rt svirt_sandbox_file_t /var/lib/kubelet; then - echo "Failed to apply selinux label to /var/lib/kubelet." - fi - fi - fi # Enable dns if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then dns_args="--cluster-dns=${DNS_SERVER_IP} --cluster-domain=${DNS_DOMAIN}" @@ -515,7 +503,7 @@ function start_kubelet { --volume=/var/run:/var/run:rw \ --volume=/sys:/sys:ro \ --volume=/var/lib/docker/:/var/lib/docker:ro \ - --volume=/var/lib/kubelet/:/var/lib/kubelet:rw,z \ + --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ --volume=/dev:/dev \ ${cred_bind} \ --net=host \