github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91684 from dims/use-containerd-as-default-in-cluster-kube-up

Browse Source 
Use containerd as default in kube-up.sh
This commit is contained in:
Kubernetes Prow Robot
2020-06-09 14:49:21 -07:00
committed by GitHub
parent 94833ccdf2 1731cb30f5
commit 47e79c73cb
4 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,13 +92,20 @@ export NODE_SERVICE_ACCOUNT=${KUBE_GCE_NODE_SERVICE_ACCOUNT:-default}
# KUBELET_TEST_ARGS are extra arguments passed to kubelet.
export KUBELET_TEST_ARGS=${KUBE_KUBELET_EXTRA_ARGS:-}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-}
CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-}
LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-}
if [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then
export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-containerd}
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
# Default container runtime
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_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-docker}
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-}
elif [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///run/containerd/containerd.sock}
export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-containerd}
export LOG_DUMP_SYSTEMD_SERVICES=${LOG_DUMP_SYSTEMD_SERVICES:-containerd}
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
fi
# Ability to inject custom versions (Ubuntu OS images ONLY)

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

@@ -96,17 +96,23 @@ export NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}}
export NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud}
export NODE_SERVICE_ACCOUNT=${KUBE_GCE_NODE_SERVICE_ACCOUNT:-default}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-}
CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-}
LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-}
export GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-}
if [[ "${CONTAINER_RUNTIME}" = 'containerd' ]]; then
CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-containerd}
LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
# Default container runtime
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_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-docker}
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-}
elif [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///run/containerd/containerd.sock}
export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-containerd}
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
export LOG_DUMP_SYSTEMD_SERVICES=${LOG_DUMP_SYSTEMD_SERVICES:-containerd}
export CONTAINER_RUNTIME_TEST_HANDLER="true"
fi
export CONTAINER_RUNTIME_NAME
export LOAD_IMAGE_COMMAND
export GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-}
# Ability to inject custom versions (Ubuntu OS images ONLY)
# if KUBE_UBUNTU_INSTALL_CONTAINERD_VERSION or KUBE_UBUNTU_INSTALL_RUNC_VERSION

2
cluster/gce/gci/configure-helper.sh
View File

@@ -2916,6 +2916,8 @@ function main() {
if [[ "${container_runtime}" == "docker" ]]; then
assemble-docker-flags
elif [[ "${container_runtime}" == "containerd" ]]; then
# stop docker if it is present as we want to use just containerd
systemctl stop docker || echo "unable to stop docker"
setup-containerd
fi
start-kubelet