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

containerd: set version and revision strings #1248

Merged
merged 1 commit into from
Dec 17, 2020

Conversation

samuelkarp
Copy link
Contributor

Issue number:
Fixes #1241

Description of changes:
Set version and revision strings for containerd

Testing done:

bash-5.0# ctr -a /run/dockershim.sock version
Client:
  Version:  1.3.7+bottlerocket
  Revision: 8fba4e9a7d01810a393d5d25a3621dc101981175

Server:
  Version:  1.3.7+bottlerocket
  Revision: 8fba4e9a7d01810a393d5d25a3621dc101981175
  UUID: 5278435f-2098-4f42-8ee1-d55ec6f511ec
$ kubectl get nodes -o custom-columns=NAME:.metadata.name,OS-IMAGE:status.nodeInfo.osImage,CONTAINER-RUNTIME:status.nodeInfo.containerRuntimeVersion
NAME                                           OS-IMAGE                CONTAINER-RUNTIME
ip-192-168-58-191.us-west-2.compute.internal   Bottlerocket OS 1.0.4   containerd://1.3.7+bottlerocket

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

Is the +suffix traditional/expected? Do we need it at all?

@samuelkarp
Copy link
Contributor Author

Is the +suffix traditional/expected? Do we need it at all?

I had reached out to one of the containerd maintainers to ask about their preferences here. The output of ctr version is helpful for them to know what version of the code is in-use in the context of a bug report, and an adjusted output here lets them know that there are differences between the upstream code and the version exhibiting a bug. Normally, their preference is for the Release field to be adjusted to indicate the patches applied (for example, an RPM NVR so they can find the SRPM) but in the context of Bottlerocket we have a single version for the whole OS and they thought a +bottlerocket suffix was sufficient.

@samuelkarp samuelkarp merged commit 714ea8f into bottlerocket-os:develop Dec 17, 2020
@samuelkarp samuelkarp deleted the containerd-version branch December 17, 2020 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bottlerocket containerd runtime version has unknown string
4 participants