Skip to content

Commit 1428580

Browse files
authored
Merge pull request #108 from sibucan/ccm-k8s-v1.21.0
Update k8s dependencies to v1.21.0
2 parents d2a6c52 + 310e0dd commit 1428580

File tree

3 files changed

+311
-425
lines changed

3 files changed

+311
-425
lines changed

go.mod

Lines changed: 59 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -10,121 +10,117 @@ require (
1010
github.com/pkg/errors v0.9.1
1111
github.com/spf13/pflag v1.0.5
1212
github.com/stretchr/testify v1.7.0
13-
k8s.io/api v0.19.2
14-
k8s.io/apimachinery v0.19.2
15-
k8s.io/client-go v0.19.2
16-
k8s.io/cloud-provider v0.19.2
17-
k8s.io/component-base v0.19.2
18-
k8s.io/klog/v2 v2.2.0
19-
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
13+
k8s.io/api v0.21.0
14+
k8s.io/apimachinery v0.21.0
15+
k8s.io/client-go v0.21.0
16+
k8s.io/cloud-provider v0.21.0
17+
k8s.io/component-base v0.21.0
18+
k8s.io/klog v1.0.0
19+
k8s.io/klog/v2 v2.8.0
2020
)
2121

2222
require (
2323
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
2424
github.com/BurntSushi/toml v0.3.1 // indirect
25-
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 // indirect
25+
github.com/NYTimes/gziphandler v1.1.1 // indirect
2626
github.com/PuerkitoBio/purell v1.1.1 // indirect
2727
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2828
github.com/beorn7/perks v1.0.1 // indirect
29-
github.com/blang/semver v3.5.0+incompatible // indirect
29+
github.com/blang/semver v3.5.1+incompatible // indirect
3030
github.com/cespare/xxhash/v2 v2.1.1 // indirect
3131
github.com/coreos/go-semver v0.3.0 // indirect
3232
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
3333
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
3434
github.com/davecgh/go-spew v1.1.1 // indirect
35-
github.com/docker/distribution v2.7.1+incompatible // indirect
3635
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
3736
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
38-
github.com/go-logr/logr v0.2.0 // indirect
37+
github.com/go-logr/logr v0.4.0 // indirect
3938
github.com/go-openapi/jsonpointer v0.19.3 // indirect
4039
github.com/go-openapi/jsonreference v0.19.3 // indirect
41-
github.com/go-openapi/spec v0.19.3 // indirect
40+
github.com/go-openapi/spec v0.19.5 // indirect
4241
github.com/go-openapi/swag v0.19.5 // indirect
4342
github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
44-
github.com/gogo/protobuf v1.3.1 // indirect
45-
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
46-
github.com/golang/protobuf v1.4.2 // indirect
47-
github.com/google/go-cmp v0.4.0 // indirect
43+
github.com/gogo/protobuf v1.3.2 // indirect
44+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
45+
github.com/golang/protobuf v1.4.3 // indirect
46+
github.com/google/go-cmp v0.5.2 // indirect
4847
github.com/google/gofuzz v1.1.0 // indirect
49-
github.com/google/uuid v1.1.1 // indirect
48+
github.com/google/uuid v1.1.2 // indirect
5049
github.com/googleapis/gnostic v0.4.1 // indirect
5150
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
5251
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5352
github.com/hashicorp/golang-lru v0.5.1 // indirect
5453
github.com/imdario/mergo v0.3.5 // indirect
5554
github.com/inconshreveable/mousetrap v1.0.0 // indirect
5655
github.com/json-iterator/go v1.1.10 // indirect
57-
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
5856
github.com/mailru/easyjson v0.7.0 // indirect
5957
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
60-
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd // indirect
58+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
6159
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6260
github.com/modern-go/reflect2 v1.0.1 // indirect
6361
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
64-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
6562
github.com/pmezard/go-difflib v1.0.0 // indirect
6663
github.com/prometheus/client_golang v1.7.1 // indirect
6764
github.com/prometheus/client_model v0.2.0 // indirect
6865
github.com/prometheus/common v0.10.0 // indirect
69-
github.com/prometheus/procfs v0.1.3 // indirect
70-
github.com/sirupsen/logrus v1.6.0 // indirect
71-
github.com/spf13/cobra v1.0.0 // indirect
72-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 // indirect
66+
github.com/prometheus/procfs v0.2.0 // indirect
67+
github.com/spf13/cobra v1.1.1 // indirect
68+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 // indirect
7369
go.uber.org/atomic v1.5.0 // indirect
7470
go.uber.org/multierr v1.3.0 // indirect
7571
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
7672
go.uber.org/zap v1.13.0 // indirect
77-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
78-
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
73+
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
74+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
7975
golang.org/x/mod v0.4.2 // indirect
8076
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
81-
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
77+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
8278
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
8379
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
84-
golang.org/x/text v0.3.3 // indirect
85-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
80+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
81+
golang.org/x/text v0.3.4 // indirect
82+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
8683
golang.org/x/tools v0.1.1 // indirect
8784
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
8885
google.golang.org/appengine v1.6.5 // indirect
89-
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
90-
google.golang.org/grpc v1.27.0 // indirect
91-
google.golang.org/protobuf v1.24.0 // indirect
86+
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
87+
google.golang.org/grpc v1.27.1 // indirect
88+
google.golang.org/protobuf v1.25.0 // indirect
9289
gopkg.in/inf.v0 v0.9.1 // indirect
9390
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
94-
gopkg.in/square/go-jose.v2 v2.2.2 // indirect
95-
gopkg.in/yaml.v2 v2.2.8 // indirect
91+
gopkg.in/yaml.v2 v2.4.0 // indirect
9692
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
97-
honnef.co/go/tools v0.0.1-2019.2.3 // indirect
98-
k8s.io/apiserver v0.19.2 // indirect
99-
k8s.io/kube-controller-manager v0.0.0 // indirect
100-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 // indirect
101-
k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7 // indirect
102-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 // indirect
103-
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 // indirect
93+
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
94+
k8s.io/apiserver v0.21.0 // indirect
95+
k8s.io/controller-manager v0.21.0 // indirect
96+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
97+
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
98+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 // indirect
99+
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
104100
sigs.k8s.io/yaml v1.2.0 // indirect
105101
)
106102

107103
replace (
108-
k8s.io/api => k8s.io/api v0.19.2
109-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.2
110-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.2
111-
k8s.io/apiserver => k8s.io/apiserver v0.19.2
112-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.2
113-
k8s.io/client-go => k8s.io/client-go v0.19.2
114-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.2
115-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.2
116-
k8s.io/code-generator => k8s.io/code-generator v0.19.2
117-
k8s.io/component-base => k8s.io/component-base v0.19.2
118-
k8s.io/cri-api => k8s.io/cri-api v0.19.2
119-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.2
120-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.2
121-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.2
122-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.2
123-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.2
124-
k8s.io/kubectl => k8s.io/kubectl v0.19.2
125-
k8s.io/kubelet => k8s.io/kubelet v0.19.2
126-
k8s.io/kubernetes => k8s.io/kubernetes v1.19.2
127-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.2
128-
k8s.io/metrics => k8s.io/metrics v0.19.2
129-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.2
104+
k8s.io/api => k8s.io/api v0.21.0
105+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
106+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
107+
k8s.io/apiserver => k8s.io/apiserver v0.21.0
108+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
109+
k8s.io/client-go => k8s.io/client-go v0.21.0
110+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
111+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
112+
k8s.io/code-generator => k8s.io/code-generator v0.21.0
113+
k8s.io/component-base => k8s.io/component-base v0.21.0
114+
k8s.io/cri-api => k8s.io/cri-api v0.21.0
115+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
116+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
117+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
118+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
119+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
120+
k8s.io/kubectl => k8s.io/kubectl v0.21.0
121+
k8s.io/kubelet => k8s.io/kubelet v0.21.0
122+
k8s.io/kubernetes => k8s.io/kubernetes v1.21.0
123+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
124+
k8s.io/metrics => k8s.io/metrics v0.21.0
125+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
130126
)

0 commit comments

Comments
 (0)