From 8e684174e49d1725af83e6d3df7d6ea38faa39fc Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Sat, 14 Dec 2019 10:41:36 -0800 Subject: [PATCH] Merge pull request #86269 from odinuge/go-mod-version Update go version in go.mod to 1.13 Kubernetes-commit: b96642aeaeefee838b5f0938e5d04765dd27d39b --- Godeps/Godeps.json | 8 ++++---- go.mod | 13 ++++++------- go.sum | 4 ++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d20adbd..40a1064 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -424,19 +424,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "11707872ac1c" + "Rev": "ca1d04f8b0d3" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "41065c7a8c2a" + "Rev": "442f8fb2f03a" }, { "ImportPath": "k8s.io/client-go", - "Rev": "571c0ef67034" + "Rev": "a32a6f7a3052" }, { "ImportPath": "k8s.io/component-base", - "Rev": "771114ba3383" + "Rev": "d868452632e2" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 3df9cca..6839b50 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager go 1.13 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a + k8s.io/component-base v0.0.0-20191214190519-d868452632e2 ) replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20191214185829-ca1d04f8b0d3 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a + k8s.io/client-go => k8s.io/client-go v0.0.0-20191214190045-a32a6f7a3052 + k8s.io/component-base => k8s.io/component-base v0.0.0-20191214190519-d868452632e2 ) diff --git a/go.sum b/go.sum index 5303a36..ae4255a 100644 --- a/go.sum +++ b/go.sum @@ -188,6 +188,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20191214185829-ca1d04f8b0d3/go.mod h1:itOjKREfmUTvcjantxOsyYU5mbFsU7qUnyUuRfF5+5M= +k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a/go.mod h1:Ng1IY8TS7sC44KJxT/WUR6qFRfWwahYYYpNXyYRKOCY= +k8s.io/client-go v0.0.0-20191214190045-a32a6f7a3052/go.mod h1:tAaoc/sYuIL0+njJefSAmE28CIcxyaFV4kbIujBlY2s= +k8s.io/component-base v0.0.0-20191214190519-d868452632e2/go.mod h1:wupxkh1T/oUDqyTtcIjiEfpbmIHGm8By/vqpSKC6z8c= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=