From 962e1e2f6dd5ca26c5ab8678fea2e9c9de0dfa54 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Mon, 13 Nov 2017 09:47:01 -0800
Subject: [PATCH 1/2] gce: readd kubelet-bootstrap to kubelet user

---
 .../rbac/legacy-kubelet-user-disable/kubelet-binding.yaml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml b/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml
index 8cb0dbea054..1d1832763b4 100644
--- a/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml
+++ b/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml
@@ -10,5 +10,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: system:node
+  name: system:node-bootstrapper
 subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: User
+  name: kubelet

From dc616dc29bc421ea4b91f8ca0ed8dfa322135e36 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Tue, 14 Nov 2017 13:45:43 -0800
Subject: [PATCH 2/2] Revert "allow configuring of the docker storage driver on
 gce"

This reverts commit 79f98a41f907ece11412602c580660556fbc2b5a.
---
 cluster/gce/config-default.sh       | 5 -----
 cluster/gce/config-test.sh          | 5 -----
 cluster/gce/gci/configure-helper.sh | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index 3f42437c258..3c9cb99af95 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -273,11 +273,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE"
 fi
 
-# Override default docker storage driver.
-if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
-  PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER"
-fi
-
 # Override default GLBC image
 if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE"
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 98815c1145a..46995d70967 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -310,11 +310,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE"
 fi
 
-# Override default docker storage driver.
-if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
-  PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER"
-fi
-
 # Override default GLBC image
 if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE"
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index e55570f4a02..93b678da28b 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -852,12 +852,6 @@ function assemble-docker-flags {
     docker_opts+=" --live-restore=false"
   fi
 
-  # Override docker storage driver if the environment variable is set
-
-  if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
-    docker_opts+=" --storage-driver=${DOCKER_STORAGE_DRIVER}"
-  fi
-
   echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker
 
   if [[ "${use_net_plugin}" == "true" ]]; then