github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 13:14:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92031 from dims/fix-default-runtime-endpoint-for-docker

Browse Source 
fix default CONTAINER_RUNTIME_ENDPOINT for docker
This commit is contained in:
Kubernetes Prow Robot
2020-06-12 02:24:11 -07:00
committed by GitHub
parent 2e6eff75e5 66015ff654
commit c5ef7ee997
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

@@ -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

2
cluster/gce/config-test.sh
View File

@@ -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