From 2ef742ba6eb7208ff4bb598ec76a5d6778cab4c9 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
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 | 10 +++++-----
 go.mod             | 21 ++++++++++-----------
 go.sum             |  7 +++++++
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 2381b31..400f558 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -76,7 +76,7 @@
 		},
 		{
 			"ImportPath": "github.com/NYTimes/gziphandler",
-			"Rev": "56545f4a5d46"
+			"Rev": "v1.1.1"
 		},
 		{
 			"ImportPath": "github.com/OneOfOne/xxhash",
@@ -920,15 +920,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/apiserver",
-			"Rev": "0d37c2610c65"
+			"Rev": "aca5ec67039c"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "3147a30d7bb5"
+			"Rev": "93ce9718ffcd"
 		},
 		{
 			"ImportPath": "k8s.io/cloud-provider",
-			"Rev": "32d923ec8b76"
+			"Rev": "3747c6100d16"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
@@ -936,7 +936,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/controller-manager",
-			"Rev": "0787fc64ca4a"
+			"Rev": "29c9515e3c7e"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 307aeea..a78064a 100644
--- a/go.mod
+++ b/go.mod
@@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
 go 1.15
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/cloud-provider v0.0.0
-	k8s.io/controller-manager v0.0.0
+	k8s.io/apimachinery v0.0.0-20210202200849-9e39a13d2cab
+	k8s.io/cloud-provider v0.0.0-20210204004302-3747c6100d16
+	k8s.io/controller-manager v0.0.0-20210204004148-29c9515e3c7e
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/cloud-provider => ../cloud-provider
-	k8s.io/component-base => ../component-base
-	k8s.io/controller-manager => ../controller-manager
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/api => k8s.io/api v0.0.0-20210202201024-9f65ac4826aa
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210202200849-9e39a13d2cab
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210204002106-aca5ec67039c
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210203041231-93ce9718ffcd
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210204004302-3747c6100d16
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210202201701-81d9ea233619
+	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210204004148-29c9515e3c7e
 )
diff --git a/go.sum b/go.sum
index 31d8736..ceea621 100644
--- a/go.sum
+++ b/go.sum
@@ -652,6 +652,13 @@ 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/apiserver v0.0.0-20210204002106-aca5ec67039c/go.mod h1:/p8eLraDQwOcfXBFj0cFuNslDGZ7LC6/JFL6Vblb22o=
+k8s.io/client-go v0.0.0-20210203041231-93ce9718ffcd/go.mod h1:mJubEonhU7Puf25vxba4hDwWZKKp6ErQbXGPi9sLXhU=
+k8s.io/cloud-provider v0.0.0-20210204004302-3747c6100d16/go.mod h1:s5+Dktg/iNky2Na2Dvwbvg84x+SvjZeEeSKkSnkN6cQ=
+k8s.io/component-base v0.0.0-20210202201701-81d9ea233619/go.mod h1:usKilGzmoexy3tmMYXYM2r6QFIS+drbtnot8qjqIXe8=
+k8s.io/controller-manager v0.0.0-20210204004148-29c9515e3c7e/go.mod h1:uSfZk2wIXPzHwchAqAto7RRNfCMpUcq8BPf6F1jaXNQ=
 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=