From d4321ab48970a2e087fb3826bfb24746fe8b967e Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 1 Dec 2022 12:16:05 +0800 Subject: [PATCH] runtime: Add identification in version for runtime-rs Now we are supporting two runtime/shim, the go version, and the rust version, for debug purposes, we can add an identification in the version info to tell us which runtime/shim is used. Fixes: #5806 Signed-off-by: Bin Liu --- src/runtime-rs/crates/shim/src/bin/main.rs | 2 +- src/runtime/cmd/containerd-shim-kata-v2/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime-rs/crates/shim/src/bin/main.rs b/src/runtime-rs/crates/shim/src/bin/main.rs index 3583f9f8ac..da2a6f12f9 100644 --- a/src/runtime-rs/crates/shim/src/bin/main.rs +++ b/src/runtime-rs/crates/shim/src/bin/main.rs @@ -95,7 +95,7 @@ fn show_help(cmd: &OsStr) { fn show_version(err: Option) { let data = format!( - r#"{} containerd shim: id: {}, version: {}, commit: {}"#, + r#"{} containerd shim (Rust): id: {}, version: {}, commit: {}"#, config::PROJECT_NAME, config::CONTAINERD_RUNTIME_NAME, config::RUNTIME_VERSION, diff --git a/src/runtime/cmd/containerd-shim-kata-v2/main.go b/src/runtime/cmd/containerd-shim-kata-v2/main.go index 412dec6ec3..b9a6890bfa 100644 --- a/src/runtime/cmd/containerd-shim-kata-v2/main.go +++ b/src/runtime/cmd/containerd-shim-kata-v2/main.go @@ -24,7 +24,7 @@ func shimConfig(config *shimapi.Config) { func main() { if len(os.Args) == 2 && os.Args[1] == "--version" { - fmt.Printf("%s containerd shim: id: %q, version: %s, commit: %v\n", katautils.PROJECT, types.DefaultKataRuntimeName, katautils.VERSION, katautils.COMMIT) + fmt.Printf("%s containerd shim (Golang): id: %q, version: %s, commit: %v\n", katautils.PROJECT, types.DefaultKataRuntimeName, katautils.VERSION, katautils.COMMIT) os.Exit(0) }