From 66015ff654ba8e0b3ffb590a6b3cc86a85022c61 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 11 Jun 2020 06:41:17 -0400 Subject: [PATCH] fix default CONTAINER_RUNTIME_ENDPOINT for docker Signed-off-by: Davanum Srinivas --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 3a0ce3625d7..4705a389066 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -98,7 +98,7 @@ export CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-containerd} # Set default values with override if [[ "${CONTAINER_RUNTIME}" == "docker" ]]; then - export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/docker.sock} + export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/dockershim.sock} export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-docker} export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-} elif [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 0f9cd3dd353..e6d90055825 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -101,7 +101,7 @@ export CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-containerd} # Set default values with override if [[ "${CONTAINER_RUNTIME}" == "docker" ]]; then - export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/docker.sock} + export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/dockershim.sock} export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-docker} export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-} elif [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then