Merge pull request #50563 from alindeman/sudo-mkdir-var-lib-kubelet

Automatic merge from submit-queue (batch tested with PRs 50563, 50698, 50796) Creates /var/lib/kubelet as root **What this PR does / why we need it**: `hack/local-cluster-up.sh` does not currently use sudo to create `/var/lib/kubelet`, so it fails unless the entire script is run with sudo. **Release note**: ```release-note NONE ```

Merge pull request #50563 from alindeman/sudo-mkdir-var-lib-kubelet
ee4cc08d · Kubernetes Submit Queue · GitHub · 5e5b586e · 60e4912b · ee4cc08d
Commit ee4cc08d authored Aug 17, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -588,14 +588,14 @@ function start_controller_manager {

 function start_kubelet {
    KUBELET_LOG=${LOG_DIR}/kubelet.log
-    mkdir -p ${POD_MANIFEST_PATH} || true
+    mkdir -p "${POD_MANIFEST_PATH}" &>/dev/null || sudo mkdir -p "${POD_MANIFEST_PATH}"

    priv_arg=""
    if [[ -n "${ALLOW_PRIVILEGED}" ]]; then
      priv_arg="--allow-privileged "
    fi

-    mkdir -p /var/lib/kubelet
+    mkdir -p "/var/lib/kubelet" &>/dev/null || sudo mkdir -p "/var/lib/kubelet"
    if [[ -z "${DOCKERIZE_KUBELET}" ]]; then
      # Enable dns
      if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then