This repository has been archived by the owner on May 12, 2021. It is now read-only.
shimv2: Add a "--version" cli option #2887
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Folded the overly long clean rule across multiple lines. Signed-off-by: James O. D. Hunt <[email protected]>
devimc
reviewed
Aug 17, 2020
| func shimConfig(config *shim.Config) { | ||
| config.NoReaper = true | ||
| config.NoSubreaper = true | ||
| } | ||
|
|
||
| func main() { | ||
| shim.Run("io.containerd.kata.v2", containerdshim.New, shimConfig) | ||
| if len(os.Args) == 2 && os.Args[1] == "--version" { |
There was a problem hiding this comment.
I wonder if this should be part of parseFlags() in shim.go, since --version is not displayed in the usage message
./containerd-shim-kata-v2 --help
Usage of ./containerd-shim-kata-v2:
-address string
grpc address back to main containerd
-bundle string
path to the bundle if not workdir
-debug
enable debug output in logs
-id string
id of the task
-namespace string
namespace that owns the shim
-publish-binary string
path to publish binary (used for publishing events) (default "containerd")
-socket string
abstract socket path to serve
There was a problem hiding this comment.
Hi @devimc - that's a good question. However, you can't call flag.Parse() twice: the first call wins meaning only --verbose would be recognised and the shim wouldn't work. Also, this is a backport from 2.0 so I'd like to keep it as similar as possible.
All components should support a `--version` option to allow clear identification of the version of the component being used. Note that the build changes are required to allow the shim binary to access the golang code generated by the build (such as the `version` variable). Fixes: kata-containers#2886. Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel
force-pushed
the
shimv2-add-version-flag
branch
from
1e74fd3 to
9bb8e36
Compare
|
/test-ubuntu |
egernst
approved these changes
Aug 19, 2020
Codecov Report
@@ Coverage Diff @@
## master #2887 +/- ##
==========================================
- Coverage 51.41% 51.40% -0.01%
==========================================
Files 118 118
Lines 17434 17441 +7
==========================================
+ Hits 8963 8965 +2
- Misses 7388 7393 +5
Partials 1083 1083 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All components should support a
--versionoption to allow clear identification of the version of the component being used.Note that the build changes are required to allow the shim binary to access the golang code generated by the build (such as the
versionvariable).This is a backport of kata-containers/kata-containers#308.
Fixes: #2886.
Signed-off-by: James O. D. Hunt [email protected]