Skip to content

[release/1.4] backport: Wait for containerd installation in GCE scripts#6553

Merged
dmcgowan merged 1 commit intocontainerd:release/1.4from
bobbypage:backport-6544-1-4
Feb 16, 2022
Merged

[release/1.4] backport: Wait for containerd installation in GCE scripts#6553
dmcgowan merged 1 commit intocontainerd:release/1.4from
bobbypage:backport-6544-1-4

Conversation

@bobbypage
Copy link
Copy Markdown
Contributor

@bobbypage bobbypage commented Feb 14, 2022

This cherrypicks #6544 to release-1.4 branch. This will only affect k/k CI and e2e tests.

Prior to running the kube-node-installation.service, the containerd
installation should be complete as the k8s installation may have
dependencies on containerd and related binaries (e.g ctr). Add
wants/after systemd directives to ensure
kube-node-installation.service will only start after containerd
installation completes.

Signed-off-by: David Porter porterdavid@google.com

@bobbypage
Copy link
Copy Markdown
Contributor Author

bobbypage commented Feb 14, 2022

/cc @SergeyKanzhelev

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Feb 14, 2022

Hi @bobbypage. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bobbypage bobbypage mentioned this pull request Feb 14, 2022
Merged
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Feb 14, 2022

Build succeeded.

@estesp estesp changed the title Wait for containerd installation in GCE scripts [1.4 backport] [release/1.4] backport: Wait for containerd installation in GCE scripts Feb 15, 2022
@estesp
Copy link
Copy Markdown
Member

estesp commented Feb 15, 2022

could you re-based on the latest HEAD of this release/1.4 branch? Just merged a fix for CI getting the wrong ginkgo version which blocks all PRs on 1.4 from getting through CI.

SergeyKanzhelev
SergeyKanzhelev approved these changes Feb 15, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@SergeyKanzhelev SergeyKanzhelev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change lgtm

thank you for making a backport

@bobbypage
Wait for containerd installation in GCE scripts
6d93874 
Prior to running the `kube-node-installation.service`, the containerd
installation should be complete as the k8s installation may have
dependencies on containerd and related binaries (e.g ctr). Add
wants/after systemd directives to ensure
`kube-node-installation.service` will only start after containerd
installation completes.

Signed-off-by: David Porter <porterdavid@google.com>
@bobbypage
Copy link
Copy Markdown
Contributor Author

bobbypage commented Feb 15, 2022

could you re-based on the latest HEAD of this release/1.4 branch? Just merged a fix for CI getting the wrong ginkgo version which blocks all PRs on 1.4 from getting through CI.

Thanks for taking a look, rebased!

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Feb 15, 2022

Build succeeded.

estesp
estesp approved these changes Feb 15, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Feb 16, 2022

/ok-to-test

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Feb 16, 2022

/ok-to-test

back on the 1.4 timeline the e2e node prow buckets ran from containerd/cri or from k/k

@dmcgowan dmcgowan merged commit 7aa560b into containerd:release/1.4 Feb 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@estesp estesp estesp approved these changes

+1 more reviewer

@SergeyKanzhelev SergeyKanzhelev SergeyKanzhelev approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@bobbypage @k8s-ci-robot @estesp @AkihiroSuda @mikebrow @dmcgowan @SergeyKanzhelev