Merge pull request #189 from mdbooth/CVE-2021-3121

Bump K8s to v0.21.0 to (mostly) address CVE-2021-3121

Author: k8s-ci-robot

go.mod

@@ -11,65 +11,42 @@ require (
 	github.com/onsi/gomega v1.7.1
 	github.com/pborman/uuid v1.2.0
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
+	golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
 	google.golang.org/grpc v1.29.0
-	k8s.io/api v0.20.0
-	k8s.io/apimachinery v0.20.0
-	k8s.io/client-go v0.20.0
-	k8s.io/klog/v2 v2.4.0
-	k8s.io/kubernetes v1.21.0-alpha.0.0.20201210005053-f58c4d8cd725
+	k8s.io/api v0.21.0
+	k8s.io/apimachinery v0.21.0
+	k8s.io/client-go v0.21.0
+	k8s.io/klog/v2 v2.8.0
+	k8s.io/kubernetes v1.21.0
 	k8s.io/mount-utils v0.0.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace k8s.io/api => k8s.io/api v0.20.0
-
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
-
-replace k8s.io/apiserver => k8s.io/apiserver v0.20.0
-
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0
-
-replace k8s.io/client-go => k8s.io/client-go v0.20.0
-
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.0
-
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.20.0
-
-replace k8s.io/component-base => k8s.io/component-base v0.20.0
-
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.20.0-alpha.2.0.20201114090304-7cb42b694587
-
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.20.0-alpha.1.0.20201209052538-b2c380a1dc86
-
-replace k8s.io/cri-api => k8s.io/cri-api v0.20.0
-
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.0
-
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0
-
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0
-
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0
-
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.20.0
-
-replace k8s.io/kubelet => k8s.io/kubelet v0.20.0
-
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.0
-
-replace k8s.io/metrics => k8s.io/metrics v0.20.0
-
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.21.0-alpha.0
-
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0
-
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.0
-
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.20.0
+replace (
+	k8s.io/api => k8s.io/api v0.21.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
+	k8s.io/apiserver => k8s.io/apiserver v0.21.0
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
+	k8s.io/client-go => k8s.io/client-go v0.21.0
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
+	k8s.io/code-generator => k8s.io/code-generator v0.21.0
+	k8s.io/component-base => k8s.io/component-base v0.21.0
+	k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
+	k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
+	k8s.io/cri-api => k8s.io/cri-api v0.21.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
+	k8s.io/kubectl => k8s.io/kubectl v0.21.0
+	k8s.io/kubelet => k8s.io/kubelet v0.21.0
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
+	k8s.io/metrics => k8s.io/metrics v0.21.0
+	k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
+	k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
+)