github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55068 from mml/e2e-version

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-11-06 12:29:12 -08:00 committed by GitHub
commit e6df9abbc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/e2e.go
View File

@ -222,7 +222,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
}
// 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
@ -231,7 +231,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
framework.Logf("Unexpected server error retrieving version: %v", serverErr)
}
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.