Merge pull request #85019 from liggitt/go-1.13-1.16
[v1.16.5] Update to go1.13.4
Kubernetes-commit: 74eb9f2b701ab3e8baaab5d34f151e82500918d2
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 206c39c..c04bb03 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -160,7 +160,7 @@
},
{
"ImportPath": "github.com/spf13/pflag",
- "Rev": "v1.0.3"
+ "Rev": "v1.0.5"
},
{
"ImportPath": "github.com/stretchr/objx",
@@ -171,24 +171,32 @@
"Rev": "v1.3.0"
},
{
+ "ImportPath": "golang.org/x/crypto",
+ "Rev": "c2843e01d9a2"
+ },
+ {
"ImportPath": "golang.org/x/net",
- "Rev": "cdfb69ac37fc"
+ "Rev": "13f9640d40b9"
},
{
"ImportPath": "golang.org/x/sync",
- "Rev": "42b317875d0f"
+ "Rev": "112230192c58"
},
{
"ImportPath": "golang.org/x/sys",
- "Rev": "3b5209105503"
+ "Rev": "fde4db37ae7a"
},
{
"ImportPath": "golang.org/x/text",
- "Rev": "e6919f6577db"
+ "Rev": "v0.3.2"
},
{
"ImportPath": "golang.org/x/tools",
- "Rev": "6c7e314b6563"
+ "Rev": "65e3620a7ae7"
+ },
+ {
+ "ImportPath": "golang.org/x/xerrors",
+ "Rev": "a985d3407aa7"
},
{
"ImportPath": "gopkg.in/check.v1",
@@ -200,7 +208,7 @@
},
{
"ImportPath": "gopkg.in/inf.v0",
- "Rev": "v0.9.0"
+ "Rev": "v0.9.1"
},
{
"ImportPath": "gopkg.in/tomb.v1",
@@ -212,7 +220,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
- "Rev": "a2eda9f80ab8"
+ "Rev": "f69eda767ee8"
},
{
"ImportPath": "k8s.io/gengo",
@@ -220,7 +228,7 @@
},
{
"ImportPath": "k8s.io/klog",
- "Rev": "v0.4.0"
+ "Rev": "v1.0.0"
},
{
"ImportPath": "k8s.io/kube-openapi",
diff --git a/go.mod b/go.mod
index 9cf3343..df24c6f 100644
--- a/go.mod
+++ b/go.mod
@@ -7,11 +7,10 @@
require (
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
github.com/stretchr/testify v1.3.0
- k8s.io/apimachinery v0.0.0
+ k8s.io/apimachinery v0.0.0-20191219145857-f69eda767ee8
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
- k8s.io/api => ../api
- k8s.io/apimachinery => ../apimachinery
+ k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191219145857-f69eda767ee8
)
diff --git a/go.sum b/go.sum
index c162d16..b6e285e 100644
--- a/go.sum
+++ b/go.sum
@@ -98,6 +98,7 @@
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/apimachinery v0.0.0-20191219145857-f69eda767ee8/go.mod h1:mhhO3hoLkWO+2eCvqjPtH2Ly92l9nJDwsswzWKpkN2w=
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 v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
