github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Include Go version, platform, and other build info in version string

Browse Source 
Additionally update MatchesServerVersion to only check GitVersion,
GitCommit, and GitTreeState.
This commit is contained in:
Jeff Grafton
2016-01-20 18:33:34 -08:00
parent 4c2d129bdb
commit fb663f2cd5
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/client/unversioned/helper.go
View File

@@ -18,7 +18,6 @@ package unversioned
import (
"fmt"
"reflect"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
@@ -98,13 +97,14 @@ func MatchesServerVersion(client *Client, c *restclient.Config) error {
return err
}
}
clientVersion := version.Get()
serverVersion, err := client.Discovery().ServerVersion()
cVer := version.Get()
sVer, err := client.Discovery().ServerVersion()
if err != nil {
return fmt.Errorf("couldn't read version from server: %v\n", err)
}
if s := *serverVersion; !reflect.DeepEqual(clientVersion, s) {
return fmt.Errorf("server version (%#v) differs from client version (%#v)!\n", s, clientVersion)
// GitVersion includes GitCommit and GitTreeState, but best to be safe?
if cVer.GitVersion != sVer.GitVersion || cVer.GitCommit != sVer.GitCommit || cVer.GitTreeState != cVer.GitTreeState {
return fmt.Errorf("server version (%#v) differs from client version (%#v)!\n", sVer, cVer)
}
return nil