From 3eed2b4ac26a3d77bc7772b78eeb5e788f79f2f2 Mon Sep 17 00:00:00 2001 From: Anthony Yeh Date: Thu, 3 Aug 2017 11:00:16 -0700 Subject: [PATCH] Kubernetes version v1.6.8 file updates Kubernetes-commit: d74e09bb4e4e7026f45becbed8310665ddcb8514 --- Godeps/Godeps.json | 88 ++++++++++++++++++++++----------------------- pkg/version/base.go | 6 ++-- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 61bd695c2..ecba75aec 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -316,179 +316,179 @@ }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/openapi", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/rand", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "85ace5365f33b16fc735c866a12e3c765b9700f2" + "Rev": "9603df80256c35a1dd4bc3037ed9690737af941b" } ] } diff --git a/pkg/version/base.go b/pkg/version/base.go index a2652c247..aa573ced6 100644 --- a/pkg/version/base.go +++ b/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 = "6+" // minor version, numeric possibly followed by "+" + gitMajor string = "1" // major version, always numeric + gitMinor string = "6" // 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,7 +51,7 @@ 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.6.8-beta.0+$Format:%h$" + gitVersion string = "v1.6.8+$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"