merge(#3602): updated 1.20.9,0.21.3->0.21.9

.wollemi.json

@@ -286,6 +286,7 @@
         "github.com/golang/snappy": "//third_party/go:github.com__golang__snappy",
         "github.com/google/btree": "//third_party/go:github.com__google__btree",
         "github.com/google/go-cmp/cmp": "//third_party/go:github.com__google__go-cmp__cmp",
+        "github.com/google/go-cmp/cmp/cmpopts": "//third_party/go:github.com__google__go-cmp__cmp__cmpopts",
         "github.com/google/go-cmp/cmp/internal/diff": "//third_party/go:github.com__google__go-cmp__cmp__internal__diff",
         "github.com/google/go-cmp/cmp/internal/flags": "//third_party/go:github.com__google__go-cmp__cmp__internal__flags",
         "github.com/google/go-cmp/cmp/internal/function": "//third_party/go:github.com__google__go-cmp__cmp__internal__function",
@@ -1284,6 +1285,7 @@
         "k8s.io/kubernetes/pkg/features": "//third_party/go:k8s.io__kubernetes__pkg__features",
         "k8s.io/kubernetes/pkg/scheduler/apis/config": "//third_party/go:k8s.io__kubernetes__pkg__scheduler__apis__config",
         "k8s.io/kubernetes/pkg/scheduler/framework": "//third_party/go:k8s.io__kubernetes__pkg__scheduler__framework",
+        "k8s.io/kubernetes/pkg/scheduler/internal/parallelize": "//third_party/go:k8s.io__kubernetes__pkg__scheduler__internal__parallelize",
         "k8s.io/kubernetes/pkg/scheduler/util": "//third_party/go:k8s.io__kubernetes__pkg__scheduler__util",
         "k8s.io/utils/buffer": "//third_party/go:k8s.io__utils__buffer",
         "k8s.io/utils/exec": "//third_party/go:k8s.io__utils__exec",

go.mod

@@ -83,7 +83,7 @@ require (
 	go.uber.org/yarpc v1.55.0
 	go.uber.org/zap v1.18.1
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 	google.golang.org/api v0.44.0
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
@@ -92,15 +92,15 @@ require (
 	gopkg.in/square/go-jose.v2 v2.5.1
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.6.1
-	k8s.io/api v0.21.3
+	k8s.io/api v0.21.9
 	k8s.io/apiextensions-apiserver v0.21.3
-	k8s.io/apimachinery v0.21.3
-	k8s.io/cli-runtime v0.21.3
-	k8s.io/client-go v0.21.3
-	k8s.io/cluster-bootstrap v0.21.3
+	k8s.io/apimachinery v0.21.9
+	k8s.io/cli-runtime v0.21.9
+	k8s.io/client-go v0.21.9
+	k8s.io/cluster-bootstrap v0.21.9
 	k8s.io/klog v1.0.0
-	k8s.io/klog/v2 v2.8.0
-	k8s.io/kubernetes v1.20.9
+	k8s.io/klog/v2 v2.9.0
+	k8s.io/kubernetes v1.21.9
 	logur.dev/adapter/logrus v0.4.1
 	logur.dev/adapter/zap v0.4.1
 	logur.dev/integration/logr v0.4.0
@@ -127,31 +127,31 @@ replace (
 	google.golang.org/grpc => google.golang.org/grpc v1.27.1
 
 	// Kubernetes
-	k8s.io/api => k8s.io/api v0.21.3
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.3
-	k8s.io/apimachinery => k8s.io/apimachinery v0.21.3
-	k8s.io/apiserver => k8s.io/apiserver v0.21.3
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.3
-	k8s.io/client-go => k8s.io/client-go v0.21.3
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.3
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.3
-	k8s.io/code-generator => k8s.io/code-generator v0.21.3
-	k8s.io/component-base => k8s.io/component-base v0.21.3
-	k8s.io/component-helpers => k8s.io/component-helpers v0.21.3
-	k8s.io/controller-manager => k8s.io/controller-manager v0.21.3
-	k8s.io/cri-api => k8s.io/cri-api v0.21.3
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.3
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.3
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.3
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.3
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.3
-	k8s.io/kubectl => k8s.io/kubectl v0.21.3
-	k8s.io/kubelet => k8s.io/kubelet v0.21.3
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.3
-	k8s.io/metrics => k8s.io/metrics v0.21.3
-	k8s.io/mount-utils => k8s.io/mount-utils v0.21.3
-	k8s.io/node-api => k8s.io/node-api v0.21.3
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.3
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.3
-	k8s.io/sample-controller => k8s.io/sample-controller v0.21.3
+	k8s.io/api => k8s.io/api v0.21.9
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.9
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.9
+	k8s.io/apiserver => k8s.io/apiserver v0.21.9
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.9
+	k8s.io/client-go => k8s.io/client-go v0.21.9
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.9
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.9
+	k8s.io/code-generator => k8s.io/code-generator v0.21.9
+	k8s.io/component-base => k8s.io/component-base v0.21.9
+	k8s.io/component-helpers => k8s.io/component-helpers v0.21.9
+	k8s.io/controller-manager => k8s.io/controller-manager v0.21.9
+	k8s.io/cri-api => k8s.io/cri-api v0.21.9
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.9
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.9
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.9
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.9
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.9
+	k8s.io/kubectl => k8s.io/kubectl v0.21.9
+	k8s.io/kubelet => k8s.io/kubelet v0.21.9
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.9
+	k8s.io/metrics => k8s.io/metrics v0.21.9
+	k8s.io/mount-utils => k8s.io/mount-utils v0.21.9
+	k8s.io/node-api => k8s.io/node-api v0.21.9
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.9
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.9
+	k8s.io/sample-controller => k8s.io/sample-controller v0.21.9
 )