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.

Sign up for GitHub

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

Jump to bottom

[candi] migrate to containerd 1.6 #2211

Closed
wants to merge 8 commits into from
Closed

[candi] migrate to containerd 1.6 #2211

wants to merge 8 commits into from

Conversation

RomanenkoDenys
Copy link
Member

@RomanenkoDenys RomanenkoDenys commented Aug 15, 2022 •
edited

Signed-off-by: Denis Romanenko denis.romanenko@flant.com

It seems that we should wait for containerd/containerd#7298 to be merged !!!!

Description

Upgrade containerd version to 1.6 and remove unneeded containerd-flant-edition binary.

Why do we need it, and what problem does it solve?

New containerd version contains many fixes.

What is the expected result?

Checklist

  • The code is covered by unit tests.
  • e2e tests passed.
  • Documentation updated according to the changes.
  • Changes were tested in the Kubernetes cluster manually.

Changelog entries

section: candi
type: chore
summary: migrate to containerd 1.6
impact_level: low

@RomanenkoDenys
[candi] migrate to containerd 1.6
cbdf579 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@RomanenkoDenys RomanenkoDenys self-assigned this Aug 15, 2022
@RomanenkoDenys RomanenkoDenys added the area/cluster-and-infrastructure Pull requests that update infra modules label Aug 15, 2022
@RomanenkoDenys RomanenkoDenys added this to the v1.35.0 milestone Aug 15, 2022
@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented Aug 15, 2022 •
edited

🔴 e2e: AWS for deckhouse:containerd-1-6 failed in 54s.

Workflow details (1 job failed)

🔴 e2e: AWS, Containerd, Kubernetes 1.21 failed in 16s.

@github-actions github-actions bot removed the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@RomanenkoDenys RomanenkoDenys added the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented Aug 15, 2022 •
edited

🔴 e2e: AWS for deckhouse:containerd-1-6 failed in 11m21s.

Workflow details (1 job failed)

🔴 e2e: AWS, Containerd, Kubernetes 1.21 failed in 10m44s.

@github-actions github-actions bot removed the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@RomanenkoDenys
[candi] migrate to containerd 1.6
1e6b4f5 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@RomanenkoDenys RomanenkoDenys added the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented Aug 15, 2022 •
edited

🔴 e2e: AWS for deckhouse:containerd-1-6 failed in 11m22s.

Workflow details (1 job failed)

🔴 e2e: AWS, Containerd, Kubernetes 1.21 failed in 10m44s.

@github-actions github-actions bot removed the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@RomanenkoDenys
[candi] migrate to containerd 1.6
0f53a53 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@RomanenkoDenys
[candi] migrate to containerd 1.6
fb0294c 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@RomanenkoDenys RomanenkoDenys added the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented Aug 15, 2022 •
edited

🟢 e2e: AWS for deckhouse:containerd-1-6 succeeded in 26m28s.

Workflow details

🟢 e2e: AWS, Containerd, Kubernetes 1.21 succeeded in 25m44s.

@github-actions github-actions bot removed the e2e/run/aws Run e2e tests in AWS label Aug 15, 2022
@RomanenkoDenys
[candi] migrate to containerd 1.6
1c1c860 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@konstantin-axenov konstantin-axenov mentioned this pull request Aug 15, 2022
Closed
4 tasks
@RomanenkoDenys
++
1bc1334 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@konstantin-axenov konstantin-axenov added e2e/run/gcp Run e2e tests in Google Cloud e2e/run/static Run e2e tests for static cluster e2e/use/cri/docker labels Aug 16, 2022
@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented Aug 16, 2022 •
edited

🟢 e2e: Static for deckhouse:containerd-1-6 succeeded in 4h25m49s.

Workflow details🔴 `e2e: Static` for `deckhouse:containerd-1-6` [failed](https://github.com/deckhouse/deckhouse/actions/runs/2866609242) in 3h39m27s.
Workflow details (1 job failed)🔴 `e2e: Static` for `deckhouse:containerd-1-6` [failed](https://github.com/deckhouse/deckhouse/actions/runs/2866609242) in 2h48m9s.
Workflow details (2 jobs failed)

🔴 e2e: Static for deckhouse:containerd-1-6 failed in 23m5s.

Workflow details (3 jobs failed)

🔴 e2e: Static, Containerd, Kubernetes 1.21 failed in 1m52s.

🔴 e2e: Static, Docker, Kubernetes 1.23 failed in 2m1s.

🔴 e2e: Static, Containerd, Kubernetes 1.23 failed in 2m8s.

🟢 e2e: Static, Docker, Kubernetes 1.21 succeeded in 22m24s.

⏩ `e2e: Static, Docker, Kubernetes 1.23` for `deckhouse:containerd-1-6` [started](https://github.com/deckhouse/deckhouse/actions/runs/2866609242).

⏩ e2e: Static, Containerd, Kubernetes 1.23 for deckhouse:containerd-1-6 started.

🔴 e2e: Static, Containerd, Kubernetes 1.21 failed in 2m10s.

🔴 e2e: Static, Docker, Kubernetes 1.23 failed in 8m32s.

🟢 e2e: Static, Containerd, Kubernetes 1.23 succeeded in 24m46s.

⏩ `e2e: Static, Docker, Kubernetes 1.23` for `deckhouse:containerd-1-6` [started](https://github.com/deckhouse/deckhouse/actions/runs/2866609242).

🔴 e2e: Static, Docker, Kubernetes 1.23 failed in 8m33s.

🟢 e2e: Static, Containerd, Kubernetes 1.21 succeeded in 24m21s.

⏩ `e2e: Static, Docker, Kubernetes 1.23` for `deckhouse:containerd-1-6` [started](https://github.com/deckhouse/deckhouse/actions/runs/2866609242).

🟢 e2e: Static, Docker, Kubernetes 1.23 succeeded in 21m31s.

@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented Aug 16, 2022 •
edited

🟢 e2e: GCP for deckhouse:containerd-1-6 succeeded in 51m43s.

Workflow details

🟢 e2e: GCP, Docker, Kubernetes 1.23 succeeded in 27m54s.

🟢 e2e: GCP, Docker, Kubernetes 1.21 succeeded in 29m7s.

🟢 e2e: GCP, Containerd, Kubernetes 1.21 succeeded in 29m7s.

🟢 e2e: GCP, Containerd, Kubernetes 1.23 succeeded in 28m36s.

@github-actions github-actions bot removed e2e/run/static Run e2e tests for static cluster e2e/run/gcp Run e2e tests in Google Cloud labels Aug 16, 2022
@RomanenkoDenys
++
ecf8522 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
@RomanenkoDenys
++
fc69421 
Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
konstantin-axenov
konstantin-axenov requested changes Aug 16, 2022
View reviewed changes
candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl
@@ -1,5 +1,4 @@
#!/bin/bash
# Copyright 2021 Flant JSC
# Copyright 2022 Flant JSC
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# Copyright 2022 Flant JSC
# Copyright 2021 Flant JSC

konstantin-axenov
konstantin-axenov reviewed Aug 16, 2022
View reviewed changes
modules/007-registrypackages/images/containerd-fe/werf.inc.yaml
- cd containerd
- git checkout tags/v{{ $version }}
- git config --global user.email "builder@deckhouse.io"
- git cherry-pick 5f3ce9512b74718ac9519196ba70dfb1ee075fbe # Do not append []string{""} to command to preserve Docker and Werf compatibility
Copy link
Member

Choose a reason for hiding this comment

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

This is still not in release of containerd - https://github.com/containerd/containerd/blob/release/1.6/pkg/cri/opts/spec.go#L66

Copy link
Member

Choose a reason for hiding this comment

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

It seems that we should wait for containerd/containerd#7298 to be merged.

@RomanenkoDenys RomanenkoDenys removed this from the v1.35.0 milestone Aug 16, 2022
@RomanenkoDenys RomanenkoDenys marked this pull request as draft August 16, 2022 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@konstantin-axenov konstantin-axenov konstantin-axenov requested changes

@name212 name212 Awaiting requested review from name212 name212 will be requested when the pull request is marked ready for review name212 is a code owner

Assignees

@RomanenkoDenys RomanenkoDenys

Labels
area/cluster-and-infrastructure Pull requests that update infra modules status/on-hold
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@RomanenkoDenys @deckhouse-BOaTswain @konstantin-axenov @zuzzas