From aca5ec67039c44686f83b3afa4f930a745fea705 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 3 Feb 2021 15:16:28 -0800 Subject: [PATCH] Merge pull request #98737 from liggitt/nytimes-license Update github.com/NYTimes/gziphandler Kubernetes-commit: aad16fd4cc0132b131ec00f112d949304de16c4c --- Godeps/Godeps.json | 4 ++-- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index f62d0c470..8b70e03b1 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -72,7 +72,7 @@ }, { "ImportPath": "github.com/NYTimes/gziphandler", - "Rev": "56545f4a5d46" + "Rev": "v1.1.1" }, { "ImportPath": "github.com/PuerkitoBio/purell", @@ -704,7 +704,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "3147a30d7bb5" + "Rev": "93ce9718ffcd" }, { "ImportPath": "k8s.io/component-base", diff --git a/go.mod b/go.mod index eec682b6d..1945bb95e 100644 --- a/go.mod +++ b/go.mod @@ -41,10 +41,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-20210202201024-9f65ac4826aa + k8s.io/apimachinery v0.0.0-20210202200849-9e39a13d2cab + k8s.io/client-go v0.0.0-20210203041231-93ce9718ffcd + k8s.io/component-base v0.0.0-20210202201701-81d9ea233619 k8s.io/klog/v2 v2.5.0 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd k8s.io/utils v0.0.0-20201110183641-67b214c5f920 @@ -54,9 +54,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-20210202201024-9f65ac4826aa + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210202200849-9e39a13d2cab + k8s.io/client-go => k8s.io/client-go v0.0.0-20210203041231-93ce9718ffcd + k8s.io/component-base => k8s.io/component-base v0.0.0-20210202201701-81d9ea233619 ) diff --git a/go.sum b/go.sum index f6f8aa73b..9f79cf46b 100644 --- a/go.sum +++ b/go.sum @@ -607,6 +607,10 @@ 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-20210202201024-9f65ac4826aa/go.mod h1:3jofhj44aajVJZcPa3+rvEFZRe4nr1NNQgw5HtNky0M= +k8s.io/apimachinery v0.0.0-20210202200849-9e39a13d2cab/go.mod h1:usCLrfBNFPxV+npBFCgIy08RBKPAhZQyIzwcvPV2eh8= +k8s.io/client-go v0.0.0-20210203041231-93ce9718ffcd/go.mod h1:mJubEonhU7Puf25vxba4hDwWZKKp6ErQbXGPi9sLXhU= +k8s.io/component-base v0.0.0-20210202201701-81d9ea233619/go.mod h1:usKilGzmoexy3tmMYXYM2r6QFIS+drbtnot8qjqIXe8= 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=