Bump kubernetes/client-go

vendor/k8s.io/client-go/pkg/version/base.go

@@ -39,8 +39,8 @@ var (
 	// them irrelevant. (Next we'll take it out, which may muck with
 	// scripts consuming the kubectl version output - but most of
 	// these should be looking at gitVersion already anyways.)
-	gitMajor string = "1"  // major version, always numeric
-	gitMinor string = "5+" // minor version, numeric possibly followed by "+"
+	gitMajor string = "" // major version, always numeric
+	gitMinor string = "" // minor version, numeric possibly followed by "+"
 
 	// semantic version, derived by build scripts (see
 	// https://github.com/kubernetes/kubernetes/blob/master/docs/design/versioning.md
@@ -51,9 +51,13 @@ var (
 	// semantic version is a git hash, but the version itself is no
 	// longer the direct output of "git describe", but a slight
 	// translation to be semver compliant.
-	gitVersion   string = "v1.5.3-beta.0+$Format:%h$"
-	gitCommit    string = "$Format:%H$"    // sha1 from git, output of $(git rev-parse HEAD)
-	gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
+
+	// NOTE: The $Format strings are replaced during 'git archive' thanks to the
+	// companion .gitattributes file containing 'export-subst' in this same
+	// directory.  See also https://git-scm.com/docs/gitattributes
+	gitVersion   string = "v0.0.0-master+$Format:%h$"
+	gitCommit    string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
+	gitTreeState string = ""            // state of git tree, either "clean" or "dirty"
 
 	buildDate string = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
 )

vendor/k8s.io/client-go/pkg/version/doc.go

@@ -17,4 +17,4 @@ limitations under the License.
 // Package version supplies version information collected at build time to
 // kubernetes components.
 // +k8s:openapi-gen=true
-package version
+package version // import "k8s.io/client-go/pkg/version"

vendor/k8s.io/client-go/pkg/version/semver.go

@@ -1,50 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package version
-
-import (
-	"strings"
-	"unicode"
-
-	"github.com/blang/semver"
-	"github.com/golang/glog"
-)
-
-func Parse(gitversion string) (semver.Version, error) {
-	// optionally trim leading spaces then one v
-	var seen bool
-	gitversion = strings.TrimLeftFunc(gitversion, func(ch rune) bool {
-		if seen {
-			return false
-		}
-		if ch == 'v' {
-			seen = true
-			return true
-		}
-		return unicode.IsSpace(ch)
-	})
-
-	return semver.Make(gitversion)
-}
-
-func MustParse(gitversion string) semver.Version {
-	v, err := Parse(gitversion)
-	if err != nil {
-		glog.Fatalf("failed to parse semver from gitversion %q: %v", gitversion, err)
-	}
-	return v
-}

vendor/k8s.io/client-go/pkg/version/version.go

@@ -19,29 +19,16 @@ package version
 import (
 	"fmt"
 	"runtime"
-)
 
-// Info contains versioning information.
-// TODO: Add []string of api versions supported? It's still unclear
-// how we'll want to distribute that information.
-type Info struct {
-	Major        string `json:"major"`
-	Minor        string `json:"minor"`
-	GitVersion   string `json:"gitVersion"`
-	GitCommit    string `json:"gitCommit"`
-	GitTreeState string `json:"gitTreeState"`
-	BuildDate    string `json:"buildDate"`
-	GoVersion    string `json:"goVersion"`
-	Compiler     string `json:"compiler"`
-	Platform     string `json:"platform"`
-}
+	apimachineryversion "k8s.io/apimachinery/pkg/version"
+)
 
 // Get returns the overall codebase version. It's for detecting
 // what code a binary was built from.
-func Get() Info {
+func Get() apimachineryversion.Info {
 	// These variables typically come from -ldflags settings and in
 	// their absence fallback to the settings in pkg/version/base.go
-	return Info{
+	return apimachineryversion.Info{
 		Major:        gitMajor,
 		Minor:        gitMinor,
 		GitVersion:   gitVersion,
@@ -53,8 +40,3 @@ func Get() Info {
 		Platform:     fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
 	}
 }
-
-// String returns info as a human-friendly version string.
-func (info Info) String() string {
-	return info.GitVersion
-}