Merge pull request #23866 from intelsdi-x/chcon_invalid_argument_in_dockerized_kubelet

Automatic merge from submit-queue invalid arg during applying SELinux label Tested with Ubuntu 16.04 with SELINUX support. Actually, after `chcon `with long label got: `chcon: failed to set type security context component to ‘system_u:object_r:svirt_sandbox_file_t:s0’: Invalid argument`

Merge pull request #23866 from intelsdi-x/chcon_invalid_argument_in_dockerized_kubelet
1ab7671f · k8s-merge-robot · GitHub · 480233c5 · 63712cbb · 1ab7671f
Commit 1ab7671f authored Jun 30, 2016 by k8s-merge-robot Committed by GitHub Jun 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

local-up-cluster.sh hack/local-up-cluster.sh +1 -1

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -324,7 +324,7 @@ function start_kubelet {
         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
+            if ! sudo chcon -Rt svirt_sandbox_file_t /var/lib/kubelet; then
               echo "Failed to apply selinux label to /var/lib/kubelet."
            fi
         fi