Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
kata-env: Remove static agent version
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jodh-intel committed May 15, 2018
1 parent 90fc7e6 commit 80bedb0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
8 changes: 3 additions & 5 deletions cli/kata-env.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
//
// XXX: Increment for every change to the output format
// (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
type MetaInfo struct {
Expand Down Expand Up @@ -98,8 +98,7 @@ type ShimInfo struct {

// AgentInfo stores agent details
type AgentInfo struct {
Type string
Version string
Type string
}

// DistroInfo stores host operating system distribution details.
Expand Down Expand Up @@ -252,8 +251,7 @@ func getShimInfo(config oci.RuntimeConfig) (ShimInfo, error) {

func getAgentInfo(config oci.RuntimeConfig) AgentInfo {
agent := AgentInfo{
Type: string(config.AgentType),
Version: unknown,
Type: string(config.AgentType),
}

return agent
Expand Down
6 changes: 2 additions & 4 deletions cli/kata-env_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ func getExpectedShimDetails(config oci.RuntimeConfig) (ShimInfo, error) {

func getExpectedAgentDetails(config oci.RuntimeConfig) (AgentInfo, error) {
return AgentInfo{
Type: string(config.AgentType),
Version: unknown,
Type: string(config.AgentType),
}, nil
}

Expand Down Expand Up @@ -697,8 +696,7 @@ func testEnvShowSettings(t *testing.T, tmpdir string, tmpfile *os.File) error {
}

agent := AgentInfo{
Type: "agent-type",
Version: "agent-version",
Type: "agent-type",
}

expectedHostDetails, err := getExpectedHostDetails(tmpdir)
Expand Down

0 comments on commit 80bedb0

Please sign in to comment.