Skip to content

K
k3s
Unverified Commit e6df9abb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #55068 from mml/e2e-version

Automatic merge from submit-queue (batch tested with PRs 55034, 55068). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Clarify what each "version" means. Some folks were getting confused by this output. Fixes #54821 ```release-note NONE ``` /area conformance /sig architecture /assign @timothysc @WilliamDenniss
parents a6b4fab8 c64a5e86
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/e2e.go
View file @ e6df9abb
...@@ -222,7 +222,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { ...@@ -222,7 +222,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
} }
// Log the version of the server and this client. // Log the version of the server and this client.
framework.Logf("Client version: %s", version.Get().GitVersion) framework.Logf("e2e test version: %s", version.Get().GitVersion)
dc := c.DiscoveryClient dc := c.DiscoveryClient
...@@ -231,7 +231,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { ...@@ -231,7 +231,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
framework.Logf("Unexpected server error retrieving version: %v", serverErr) framework.Logf("Unexpected server error retrieving version: %v", serverErr)
} }
if serverVersion != nil { if serverVersion != nil {
framework.Logf("Server version: %s", serverVersion.GitVersion) framework.Logf("kube-apiserver version: %s", serverVersion.GitVersion)
} }
// Reference common test to make the import valid. // Reference common test to make the import valid.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment