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