github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

kata-env: Remove static agent version

Browse Source 
Remove the agent version from the output of `kata-env`. The value was
always a static string (`<<unknown>>`) because the runtime cannot
determine the agent version without creating a container.

Note that agent details, including the version, *are* displayed when
the user runs `kata-collect-data.sh`.

Fixes #310.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2018-05-15 10:27:06 +01:00
parent 90fc7e6d85
commit 80bedb005e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/kata-env.go
View File

@ -21,7 +21,7 @@ import (
// //
// XXX: Increment for every change to the output format // XXX: Increment for every change to the output format
// (meaning any change to the EnvInfo type). // (meaning any change to the EnvInfo type).
const formatVersion = "1.0.11" const formatVersion = "1.0.12"
// MetaInfo stores information on the format of the output itself // MetaInfo stores information on the format of the output itself
type MetaInfo struct { type MetaInfo struct {
@ -98,8 +98,7 @@ type ShimInfo struct {
// AgentInfo stores agent details // AgentInfo stores agent details
type AgentInfo struct { type AgentInfo struct {
Type string Type string
Version string
} }
// DistroInfo stores host operating system distribution details. // DistroInfo stores host operating system distribution details.
@ -252,8 +251,7 @@ func getShimInfo(config oci.RuntimeConfig) (ShimInfo, error) {
func getAgentInfo(config oci.RuntimeConfig) AgentInfo { func getAgentInfo(config oci.RuntimeConfig) AgentInfo {
agent := AgentInfo{ agent := AgentInfo{
Type: string(config.AgentType), Type: string(config.AgentType),
Version: unknown,
} }
return agent return agent

6
cli/kata-env_test.go
View File

@ -148,8 +148,7 @@ func getExpectedShimDetails(config oci.RuntimeConfig) (ShimInfo, error) {
func getExpectedAgentDetails(config oci.RuntimeConfig) (AgentInfo, error) { func getExpectedAgentDetails(config oci.RuntimeConfig) (AgentInfo, error) {
return AgentInfo{ return AgentInfo{
Type: string(config.AgentType), Type: string(config.AgentType),
Version: unknown,
}, nil }, nil
} }
@ -697,8 +696,7 @@ func testEnvShowSettings(t *testing.T, tmpdir string, tmpfile *os.File) error {
} }
agent := AgentInfo{ agent := AgentInfo{
Type: "agent-type", Type: "agent-type",
Version: "agent-version",
} }
expectedHostDetails, err := getExpectedHostDetails(tmpdir) expectedHostDetails, err := getExpectedHostDetails(tmpdir)