From 6b7cca877d2bd8627b294faff0b14a17eeadc2ed Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 13 Nov 2020 08:34:23 -0800 Subject: [PATCH] Merge pull request #96549 from caesarxuchao/net-sys-dep-update update golang.org/x/net and golang.org/x/sys Kubernetes-commit: 85cd7c530bf55cd369bdcb92a5a31d3d1547113f --- Godeps/Godeps.json | 12 ++++++------ go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 9b9b35fec..f0e41db1e 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -576,7 +576,7 @@ }, { "ImportPath": "golang.org/x/net", - "Rev": "ab3426394381" + "Rev": "69a78807bb2b" }, { "ImportPath": "golang.org/x/oauth2", @@ -588,7 +588,7 @@ }, { "ImportPath": "golang.org/x/sys", - "Rev": "ed371f2e16b4" + "Rev": "5cba982894dd" }, { "ImportPath": "golang.org/x/text", @@ -684,19 +684,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "9e320febc26e" + "Rev": "e29b22345993" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "671277bf9349" + "Rev": "323157012f87" }, { "ImportPath": "k8s.io/client-go", - "Rev": "30548acd0a9e" + "Rev": "d396fd99ebba" }, { "ImportPath": "k8s.io/component-base", - "Rev": "d069ee2b5079" + "Rev": "3e59e5bc0401" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index fd37f4a0b..04e50e33b 100644 --- a/go.mod +++ b/go.mod @@ -40,10 +40,10 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20201113170045-e29b22345993 + k8s.io/apimachinery v0.0.0-20201113165551-323157012f87 + k8s.io/client-go v0.0.0-20201113170634-d396fd99ebba + k8s.io/component-base v0.0.0-20201113171707-3e59e5bc0401 k8s.io/klog/v2 v2.4.0 k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 k8s.io/utils v0.0.0-20201104234853-8146046b121e @@ -53,9 +53,8 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base + k8s.io/api => k8s.io/api v0.0.0-20201113170045-e29b22345993 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201113165551-323157012f87 + k8s.io/client-go => k8s.io/client-go v0.0.0-20201113170634-d396fd99ebba + k8s.io/component-base => k8s.io/component-base v0.0.0-20201113171707-3e59e5bc0401 ) diff --git a/go.sum b/go.sum index b24a3de40..a834118b1 100644 --- a/go.sum +++ b/go.sum @@ -510,6 +510,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= +k8s.io/api v0.0.0-20201113170045-e29b22345993/go.mod h1:362/GqkXNVPwoEwWpkZKzwZMG+LMlN10vnhCeXFI3aY= +k8s.io/apimachinery v0.0.0-20201113165551-323157012f87/go.mod h1:+KfUCNguqd2qWwVjquYpKqADrfHI1YLkVv092b20wx4= +k8s.io/client-go v0.0.0-20201113170634-d396fd99ebba/go.mod h1:fRGUMOfT5+RRf734C2FMFBMKwQPdjVvywzQFAolAtuY= +k8s.io/component-base v0.0.0-20201113171707-3e59e5bc0401/go.mod h1:CcStpifhgPocWuLBoGneqkfz5QOuX+8vIk89S/r4FeU= 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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=