Vendor k/*@v0.20 and controller-runtime@v0.8 (#3651)

* make revendor generate

* Get rid of third_party/forked/kubernetes

* Adapt Patch() expectations of MockClient

Due to kubernetes-sigs/controller-runtime#1413,
naive gomock expectations don't work anymore. The reason is that the
`mergeFromPatch` struct has now a function attribute (`createPatch`),
and as `gomega` is using `reflect.DeepEqual` under the hood, the
comparison now fails:

> Func values are deeply equal if both are nil; otherwise they are not deeply equal.
(from https://golang.org/pkg/reflect/#DeepEqual)

Hence, we introduce our own `test.EXPECTPatch()` function.

Thanks to @timuthy for pointing this out.

* Adapt kubelet config

cmd/gardener-apiserver/app/gardener_apiserver.go

@@ -39,7 +39,6 @@ import (
 	settingsclientset "github.com/gardener/gardener/pkg/client/settings/clientset/versioned"
 	settingsinformer "github.com/gardener/gardener/pkg/client/settings/informers/externalversions"
 	"github.com/gardener/gardener/pkg/openapi"
-	"github.com/gardener/gardener/third_party/forked/kubernetes/pkg/quota/v1/generic"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -49,6 +48,7 @@ import (
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/admission"
 	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
+	"k8s.io/apiserver/pkg/quota/v1/generic"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 	"k8s.io/apiserver/pkg/server/options/encryptionconfig"

extensions/pkg/controller/utils_test.go

@@ -23,6 +23,7 @@ import (
 	v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	mockclient "github.com/gardener/gardener/pkg/mock/controller-runtime/client"
+	"github.com/gardener/gardener/pkg/utils/test"
 
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
@@ -148,9 +149,11 @@ var _ = Describe("Utils", func() {
 	Describe("#RemoveAnnotation", func() {
 		It("should delete specific annotation", func() {
 			annotation := "test-delete-annotation-key"
+
 			annotations := make(map[string]string)
 			annotations[annotation] = "test-delete-annotation-value"
 			annotations["test-no-delete-annotation-key"] = "test-no-delete-annotation-value"
+
 			worker := &extensionsv1alpha1.Worker{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Worker",
@@ -163,9 +166,11 @@ var _ = Describe("Utils", func() {
 				},
 			}
 			workerWithAnnotation := worker.DeepCopyObject()
-			ctx := context.TODO()
+			expectedWorker := worker.DeepCopy()
+			delete(expectedWorker.Annotations, annotation)
 
-			c.EXPECT().Patch(ctx, worker, client.MergeFrom(workerWithAnnotation))
+			ctx := context.TODO()
+			test.EXPECTPatch(ctx, c, expectedWorker, workerWithAnnotation)
 
 			Expect(controller.RemoveAnnotation(ctx, c, worker, annotation)).To(Succeed())
 			Expect(len(worker.Annotations)).To(Equal(1))

go.mod

@@ -21,7 +21,6 @@ require (
 	github.com/golang/mock v1.5.0
 	github.com/googleapis/gnostic v0.5.1
 	github.com/hashicorp/go-multierror v1.0.0
-	github.com/hashicorp/golang-lru v0.5.4
 	github.com/huandu/xstrings v1.3.1
 	github.com/json-iterator/go v1.1.10
 	github.com/mholt/archiver v3.1.1+incompatible
@@ -31,37 +30,37 @@ require (
 	github.com/prometheus/client_golang v1.7.1
 	github.com/robfig/cron v1.2.0
 	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.6.1
+	github.com/spf13/viper v1.7.0
 	github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6
 	go.uber.org/zap v1.15.0
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
 	golang.org/x/lint v0.0.0-20200302205851-738671d3881b
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	gomodules.xyz/jsonpatch/v2 v2.1.0
 	gonum.org/v1/gonum v0.8.2
 	gopkg.in/yaml.v2 v2.3.0
 	istio.io/api v0.0.0-20201123152548-197f11e4ea09
 	istio.io/client-go v1.8.1
-	k8s.io/api v0.19.6
-	k8s.io/apiextensions-apiserver v0.19.6
-	k8s.io/apimachinery v0.19.6
-	k8s.io/apiserver v0.19.6
+	k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apimachinery v0.20.2
+	k8s.io/apiserver v0.20.2
 	k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/cluster-bootstrap v0.19.6
-	k8s.io/code-generator v0.19.6
-	k8s.io/component-base v0.19.6
-	k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14
+	k8s.io/cluster-bootstrap v0.20.2
+	k8s.io/code-generator v0.20.2
+	k8s.io/component-base v0.20.2
+	k8s.io/gengo v0.0.0-20201113003025-83324d819ded
 	k8s.io/helm v2.16.1+incompatible
 	k8s.io/klog v1.0.0
-	k8s.io/kube-aggregator v0.19.6
-	k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 // keep this value in sync with k8s.io/apiserver
-	k8s.io/kubelet v0.19.6
-	k8s.io/metrics v0.19.6
-	k8s.io/utils v0.0.0-20200912215256-4140de9c8800
-	sigs.k8s.io/controller-runtime v0.7.1
+	k8s.io/kube-aggregator v0.20.2
+	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // keep this value in sync with k8s.io/apiserver
+	k8s.io/kubelet v0.20.2
+	k8s.io/metrics v0.20.2
+	k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
+	sigs.k8s.io/controller-runtime v0.8.3
 	sigs.k8s.io/controller-tools v0.4.1
 	sigs.k8s.io/yaml v1.2.0
 )
@@ -70,18 +69,17 @@ replace (
 	github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.9.5+incompatible // keep this value in sync with k8s.io/apiserver
 	github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.9.4
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1 // keep this value in sync with k8s.io/client-go
+	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1 // keep this value in sync with sigs.k8s.io/controller-runtime
 	google.golang.org/grpc => google.golang.org/grpc v1.27.0 // keep this value in sync with k8s.io/apiserver
-	k8s.io/api => k8s.io/api v0.19.6
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.6
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.6
-	k8s.io/apiserver => k8s.io/apiserver v0.19.6
-	k8s.io/client-go => k8s.io/client-go v0.19.6
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.6
-	k8s.io/code-generator => k8s.io/code-generator v0.19.6
-	k8s.io/component-base => k8s.io/component-base v0.19.6
+	k8s.io/api => k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
+	k8s.io/apiserver => k8s.io/apiserver v0.20.2
+	k8s.io/client-go => k8s.io/client-go v0.20.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
+	k8s.io/code-generator => k8s.io/code-generator v0.20.2
+	k8s.io/component-base => k8s.io/component-base v0.20.2
 	k8s.io/helm => k8s.io/helm v2.13.1+incompatible
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.6
-	k8s.io/kube-openapi => github.com/gardener/kube-openapi v0.0.0-20201221124747-75e88872edcf // k8s-1.19
-	sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.2-0.20210114175505-c02124475cb0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
+	sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // remove after https://github.com/kubernetes/kubernetes/pull/99038 is merged and released
 )