Skip to content

Commit 87b6791

Browse files
authored
Merge pull request #402 from boddumanohar/Bump-K8s-to-v0.21.0
Bump K8s to v0.21.0 to address CVE-2021-3121
2 parents eeb77e7 + 57bd429 commit 87b6791

File tree

1,641 files changed

+117105
-17655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,641 files changed

+117105
-17655
lines changed

go.mod

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Azure/go-autorest/autorest v0.11.17
88
github.com/Azure/go-autorest/autorest/adal v0.9.10
99
github.com/container-storage-interface/spec v1.3.0
10-
github.com/golang/mock v1.4.3
10+
github.com/golang/mock v1.4.4
1111
github.com/golang/protobuf v1.4.3
1212
github.com/imdario/mergo v0.3.9 // indirect
1313
github.com/kubernetes-csi/csi-lib-utils v0.9.1
@@ -16,15 +16,15 @@ require (
1616
github.com/pborman/uuid v1.2.0
1717
github.com/pelletier/go-toml v1.2.0
1818
github.com/stretchr/testify v1.7.0
19-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
19+
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
2020
google.golang.org/grpc v1.36.0
2121
google.golang.org/protobuf v1.25.0
22-
k8s.io/api v0.20.0
23-
k8s.io/apimachinery v0.20.0
24-
k8s.io/client-go v0.20.0
25-
k8s.io/component-base v0.20.0
26-
k8s.io/klog/v2 v2.4.0
27-
k8s.io/kubernetes v1.21.0-alpha.0.0.20201210005053-f58c4d8cd725
22+
k8s.io/api v0.21.0
23+
k8s.io/apimachinery v0.21.0
24+
k8s.io/client-go v0.21.0
25+
k8s.io/component-base v0.21.0
26+
k8s.io/klog/v2 v2.8.0
27+
k8s.io/kubernetes v1.21.0
2828
k8s.io/mount-utils v0.0.0
2929
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
3030
sigs.k8s.io/cloud-provider-azure v0.0.0
@@ -33,37 +33,36 @@ require (
3333

3434
replace (
3535
github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.3.0
36+
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
3637
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
3738
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
3839
google.golang.org/grpc => google.golang.org/grpc v1.35.0
39-
k8s.io/api => k8s.io/api v0.20.0
40-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
41-
k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
42-
k8s.io/apiserver => k8s.io/apiserver v0.20.0
43-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0
44-
k8s.io/client-go => k8s.io/client-go v0.0.0-20201209050023-e24efdc77f15
45-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201021002512-82fca6d2b013
46-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0
40+
k8s.io/api => k8s.io/api v0.21.0
41+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
42+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
43+
k8s.io/apiserver => k8s.io/apiserver v0.21.0
44+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
45+
k8s.io/client-go => k8s.io/client-go v0.21.0
46+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
47+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
4748
k8s.io/code-generator => k8s.io/code-generator v0.20.0
48-
k8s.io/component-base => k8s.io/component-base v0.20.0
49-
k8s.io/component-helpers => k8s.io/component-helpers v0.20.0-alpha.2.0.20201114090304-7cb42b694587
50-
k8s.io/controller-manager => k8s.io/controller-manager v0.20.0-alpha.1.0.20201209052538-b2c380a1dc86
51-
k8s.io/cri-api => k8s.io/cri-api v0.20.0
52-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200530124324-08bf6a63b59d
53-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0
54-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0
49+
k8s.io/component-base => k8s.io/component-base v0.21.0
50+
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
51+
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
52+
k8s.io/cri-api => k8s.io/cri-api v0.21.0
53+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
54+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
55+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
5556
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
56-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0
57-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0
58-
k8s.io/kubectl => k8s.io/kubectl v0.20.0
59-
k8s.io/kubelet => k8s.io/kubelet v0.20.0
60-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20201125092503-cc0a0abf3d78
61-
k8s.io/metrics => k8s.io/metrics v0.20.0
62-
k8s.io/mount-utils => k8s.io/mount-utils v0.21.0-alpha.0
63-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0
64-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.0
65-
k8s.io/sample-controller => k8s.io/sample-controller v0.20.0
57+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
58+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
59+
k8s.io/kubectl => k8s.io/kubectl v0.21.0
60+
k8s.io/kubelet => k8s.io/kubelet v0.21.0
61+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
62+
k8s.io/metrics => k8s.io/metrics v0.21.0
63+
k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
64+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
65+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
66+
k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
6667
sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.1-0.20210309114433-837741f64934
6768
)
68-
69-
replace github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e

0 commit comments

Comments
 (0)