Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support using docker containerd in COS and Ubuntu on GCE. #77889

Merged

Conversation

@Random-Liu
Copy link
Member

commented May 15, 2019

This PR:

  • Update COS to cos-73-11647-163-0 (a stable version);
  • Support using the containerd shipped as part of Docker in COS and Ubuntu on GCE.

To use it, just run:

export KUBE_CONTAINER_RUNTIME=containerd
cluster/kube-up.sh

/cc @dchen1107 @yujuhong @yguo0905
Signed-off-by: Lantao Liu lantaol@google.com

Support starting Kubernetes on GCE using containerd in COS and Ubuntu with `KUBE_CONTAINER_RUNTIME=containerd`.
@Random-Liu

This comment has been minimized.

Copy link
Member Author

commented May 15, 2019

/retest

@Random-Liu Random-Liu force-pushed the Random-Liu:support-using-containerd-in-cos branch from 48ca59c to 328560d May 15, 2019

@k8s-ci-robot k8s-ci-robot added size/L and removed size/M labels May 15, 2019

CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-containerd}
CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///run/containerd/containerd.sock}
LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
KUBELET_TEST_ARGS="${KUBE_KUBELET_EXTRA_ARGS:-} --runtime-cgroups=/system.slice/containerd.service"

This comment has been minimized.

Copy link
@yujuhong

yujuhong May 15, 2019

Member

How about appending to KUBELET_TEST_ARGS directly? That way if line 97 changes, this wouldn't break

This comment has been minimized.

Copy link
@Random-Liu

Random-Liu May 16, 2019

Author Member

Done

@@ -95,6 +95,12 @@ MASTER_EXTRA_METADATA=${KUBE_MASTER_EXTRA_METADATA:-${KUBE_EXTRA_METADATA:-}}
NODE_EXTRA_METADATA=${KUBE_NODE_EXTRA_METADATA:-${KUBE_EXTRA_METADATA:-}}
# KUBELET_TEST_ARGS are extra arguments passed to kubelet.
KUBELET_TEST_ARGS=${KUBE_KUBELET_EXTRA_ARGS:-}
if [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then

This comment has been minimized.

Copy link
@yujuhong

yujuhong May 15, 2019

Member

I'm torn between leaving this as it is, or grouping the block with the docker settings above.

This comment has been minimized.

Copy link
@Random-Liu

Random-Liu May 16, 2019

Author Member

Like this?

@@ -782,8 +782,8 @@ function construct-linux-kubelet-flags {
if [[ -n "${NODE_TAINTS:-}" ]]; then
flags+=" --register-with-taints=${NODE_TAINTS}"
fi
if [[ -n "${CONTAINER_RUNTIME:-}" ]]; then
flags+=" --container-runtime=${CONTAINER_RUNTIME}"
if [[ "${CONTAINER_RUNTIME:-docker}" != "docker" ]]; then

This comment has been minimized.

Copy link
@yujuhong

yujuhong May 15, 2019

Member

Don't we default CONTAINER_RUNTIME to docker anyway?

This comment has been minimized.

Copy link
@Random-Liu

Random-Liu May 16, 2019

Author Member

Done.

assemble-docker-flags
elif [[ "${container_runtime}" == "containerd" ]]; then
if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then
gke-setup-containerd

This comment has been minimized.

Copy link
@yujuhong

yujuhong May 15, 2019

Member

hmm....so we still keep an internal copy of setup function.....is that necessary?

This comment has been minimized.

Copy link
@Random-Liu

Random-Liu May 16, 2019

Author Member

Removed

Support using docker containerd in COS and Ubuntu on GCE.
Signed-off-by: Lantao Liu <lantaol@google.com>

@Random-Liu Random-Liu force-pushed the Random-Liu:support-using-containerd-in-cos branch from 328560d to bc1a78d May 16, 2019

@Random-Liu

This comment has been minimized.

Copy link
Member Author

commented May 16, 2019

/test pull-kubernetes-e2e-gce-device-plugin-gpu

@yujuhong

This comment has been minimized.

Copy link
Member

commented May 17, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label May 17, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented May 17, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, yujuhong

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Random-Liu

This comment has been minimized.

Copy link
Member Author

commented May 17, 2019

/test pull-kubernetes-e2e-gce-100-performance

@fejta-bot

This comment has been minimized.

Copy link

commented May 17, 2019

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 72f6954 into kubernetes:master May 18, 2019

20 checks passed

cla/linuxfoundation Random-Liu authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-csi-serial Skipped.
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gce-storage-slow Skipped.
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details

@Random-Liu Random-Liu deleted the Random-Liu:support-using-containerd-in-cos branch May 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.