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

Add v3 (2.x) format containerd configuration #49109

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

pegasas
Copy link
Contributor

@pegasas pegasas commented Dec 16, 2024

Description

Add v3 Containerd configuration format

see #48976 (comment)

Issue

Closes: #48976

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 16, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign chanieljdan for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@k8s-ci-robot k8s-ci-robot added the language/en Issues or PRs related to English language label Dec 16, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 16, 2024
Copy link

netlify bot commented Dec 16, 2024

Pull request preview available for checking

Built without sensitive environment variables

Name Link
🔨 Latest commit 5040444
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/67645e518d47900008cd2039
😎 Deploy Preview https://deploy-preview-49109--kubernetes-io-main-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@afbjorklund
Copy link

There is a similar change needed a few lines down, for the sandbox image configuration.

https://github.com/kubernetes/website/blob/000382cc16effe1416202882dc39ae4dc0aea35a/content/en/docs/setup/production-environment/container-runtimes.md#overriding-the-sandbox-pause-image-override-pause-image-containerd

[plugins."io.containerd.grpc.v1.cri"]
  sandbox_image = "registry.k8s.io/pause:3.2"

Not sure you want to repeat the "version" for each snippet though, or about the indentation?

@pegasas
Copy link
Contributor Author

pegasas commented Dec 16, 2024

There is a similar change needed a few lines down, for the sandbox image configuration.

https://github.com/kubernetes/website/blob/000382cc16effe1416202882dc39ae4dc0aea35a/content/en/docs/setup/production-environment/container-runtimes.md#overriding-the-sandbox-pause-image-override-pause-image-containerd

[plugins."io.containerd.grpc.v1.cri"]
  sandbox_image = "registry.k8s.io/pause:3.2"

Not sure you want to repeat the "version" for each snippet though, or about the indentation?

Good catch!
I modified both these places.

@afbjorklund
Copy link

afbjorklund commented Dec 16, 2024

Did you see the question about updating the example to the current pause image version? It can be handled as a separate issue, since it affects all runtimes (not only containerd)

#48976 (comment)

Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

Is it feasible to use tabs here?

We prefer tabs when readers have a choice.

@pegasas
Copy link
Contributor Author

pegasas commented Dec 18, 2024

Did you see the question about updating the example to the current pause image version? It can be handled as a separate issue, since it affects all runtimes (not only containerd)

#48976 (comment)

Hi, @afbjorklund ,
I am sorry that I miss the comment before.

Now I correct the docker image version from 3.2 to 3.6.
FYI.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 18, 2024
@pegasas
Copy link
Contributor Author

pegasas commented Dec 18, 2024

Is it feasible to use tabs here?

We prefer tabs when readers have a choice.

Hi, @sftim ,

Thanks for your advice.
I've corrected these two places into tabs.

@afbjorklund
Copy link

Now I correct the docker image version from 3.2 to 3.6.

It was supposed to be 3.10

Better to do it properly in a separate PR, perhaps

Since it affects more than just containerd

So you can leave it out in this commit for v2 / v3...

@pegasas
Copy link
Contributor Author

pegasas commented Dec 19, 2024

3.2

sure.

I correct these two back to origin 3.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Containerd configuration needs to show new format version
4 participants