From a33729487127b6a6e13b44b2c9861946e28a2d48 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 2 Mar 2021 08:57:19 -0800 Subject: [PATCH] Merge pull request #98572 from justaugustus/go116 [go1.16] Update to go1.16 Kubernetes-commit: e4e9c31218becac11f176cc824f5cc6b7a8036ac --- Godeps/Godeps.json | 18 +++++++++++------- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 1c1e8466..a2715551 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -136,7 +136,7 @@ }, { "ImportPath": "github.com/fsnotify/fsnotify", - "Rev": "v1.4.9" + "Rev": "v1.4.7" }, { "ImportPath": "github.com/ghodss/yaml", @@ -360,7 +360,7 @@ }, { "ImportPath": "golang.org/x/crypto", - "Rev": "7f63de1d35b0" + "Rev": "5ea612d1eb83" }, { "ImportPath": "golang.org/x/exp", @@ -384,7 +384,7 @@ }, { "ImportPath": "golang.org/x/net", - "Rev": "69a78807bb2b" + "Rev": "3d97a244fca7" }, { "ImportPath": "golang.org/x/oauth2", @@ -396,7 +396,11 @@ }, { "ImportPath": "golang.org/x/sys", - "Rev": "5cba982894dd" + "Rev": "a50acf3fe073" + }, + { + "ImportPath": "golang.org/x/term", + "Rev": "6a3ed077a48d" }, { "ImportPath": "golang.org/x/text", @@ -404,7 +408,7 @@ }, { "ImportPath": "golang.org/x/time", - "Rev": "3af7569d3a1e" + "Rev": "f8bda1e9f3ba" }, { "ImportPath": "golang.org/x/tools", @@ -468,11 +472,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "b852e500ef89" + "Rev": "9a813edcaca0" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "603e04655e9f" + "Rev": "317ebe7c2dbd" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 75014b02..abd78492 100644 --- a/go.mod +++ b/go.mod @@ -27,15 +27,14 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20210303092247-9a813edcaca0 + k8s.io/apimachinery v0.0.0-20210303091935-317ebe7c2dbd k8s.io/klog/v2 v2.5.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20210303092247-9a813edcaca0 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210303091935-317ebe7c2dbd ) diff --git a/go.sum b/go.sum index 76fbd3ab..6eb78839 100644 --- a/go.sum +++ b/go.sum @@ -427,6 +427,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20210303092247-9a813edcaca0/go.mod h1:qxh9oDzIeshHqWh3cuMICYK1FYe9LYCg1mIgGu4TFGQ= +k8s.io/apimachinery v0.0.0-20210303091935-317ebe7c2dbd/go.mod h1:+s3G/nGQJY9oe1CFOXRrb9QkXTIEgTnFtF8GeKZIgOg= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=