Skip to content

Commit 35e9a26

Browse files
authored
Merge pull request #75 from maiqueb/bump-k8s-1.23
build: update go modules to use k8s-1.23
2 parents e660056 + 2a72767 commit 35e9a26

876 files changed

Lines changed: 78661 additions & 29211 deletions

File tree

Some content is hidden

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

go.mod

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ require (
1414
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
1515
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
1616
golang.org/x/net v0.0.0-20211209124913-491a49abca63
17-
golang.org/x/tools v0.0.0-20210106214847-113979e3529a
18-
google.golang.org/grpc v1.32.0
17+
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff
18+
google.golang.org/grpc v1.40.0
1919
k8s.io/api v0.23.6
2020
k8s.io/apimachinery v0.23.6
2121
k8s.io/client-go v0.23.6
@@ -28,67 +28,70 @@ require (
2828
github.com/dustin/go-humanize v1.0.0 // indirect
2929
github.com/fsnotify/fsnotify v1.4.9 // indirect
3030
github.com/github-release/github-release v0.8.1 // indirect
31-
github.com/go-logr/logr v0.4.0 // indirect
31+
github.com/go-logr/logr v1.2.0 // indirect
3232
github.com/go-stack/stack v1.8.0 // indirect
3333
github.com/gogo/protobuf v1.3.2 // indirect
34-
github.com/golang/protobuf v1.5.0 // indirect
34+
github.com/golang/protobuf v1.5.2 // indirect
3535
github.com/google/go-cmp v0.5.5 // indirect
3636
github.com/google/gofuzz v1.1.0 // indirect
37-
github.com/googleapis/gnostic v0.4.1 // indirect
37+
github.com/googleapis/gnostic v0.5.5 // indirect
3838
github.com/imdario/mergo v0.3.5 // indirect
3939
github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1 // indirect
40-
github.com/json-iterator/go v1.1.10 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
4141
github.com/kevinburke/rest v0.0.0-20200429221318-0d2892b400f8 // indirect
4242
github.com/mattn/go-colorable v0.1.7 // indirect
4343
github.com/mattn/go-isatty v0.0.12 // indirect
4444
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
45-
github.com/modern-go/reflect2 v1.0.1 // indirect
45+
github.com/modern-go/reflect2 v1.0.2 // indirect
4646
github.com/nxadm/tail v1.4.4 // indirect
4747
github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 // indirect
4848
github.com/spf13/pflag v1.0.5 // indirect
4949
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
5050
github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
51-
golang.org/x/mod v0.3.0 // indirect
52-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
53-
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect
54-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
55-
golang.org/x/text v0.3.6 // indirect
56-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
51+
golang.org/x/mod v0.4.2 // indirect
52+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
53+
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
54+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
55+
golang.org/x/text v0.3.7 // indirect
56+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
5757
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
58-
google.golang.org/appengine v1.6.5 // indirect
59-
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
60-
google.golang.org/protobuf v1.26.0 // indirect
58+
google.golang.org/appengine v1.6.7 // indirect
59+
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
60+
google.golang.org/protobuf v1.27.1 // indirect
6161
gopkg.in/inf.v0 v0.9.1 // indirect
6262
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6363
gopkg.in/yaml.v2 v2.4.0 // indirect
64-
k8s.io/klog/v2 v2.9.0 // indirect
64+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
65+
k8s.io/klog/v2 v2.30.0 // indirect
66+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
6567
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
68+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
6669
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
6770
sigs.k8s.io/yaml v1.2.0 // indirect
6871
)
6972

7073
// Pinned to kubernetes-1.21.11
7174
replace (
7275
golang.org/x/text => golang.org/x/text v0.3.3
73-
k8s.io/api => k8s.io/api v0.21.11
74-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.11
75-
k8s.io/apimachinery => k8s.io/apimachinery v0.21.11
76-
k8s.io/apiserver => k8s.io/apiserver v0.21.11
77-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.11
78-
k8s.io/client-go => k8s.io/client-go v0.21.11
79-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.11
80-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.11
81-
k8s.io/code-generator => k8s.io/code-generator v0.21.11
82-
k8s.io/component-base => k8s.io/component-base v0.21.11
83-
k8s.io/cri-api => k8s.io/cri-api v0.21.11
84-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.11
85-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.11
86-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.11
76+
k8s.io/api => k8s.io/api v0.23.6
77+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6
78+
k8s.io/apimachinery => k8s.io/apimachinery v0.23.6
79+
k8s.io/apiserver => k8s.io/apiserver v0.23.6
80+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.6
81+
k8s.io/client-go => k8s.io/client-go v0.23.6
82+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.6
83+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.6
84+
k8s.io/code-generator => k8s.io/code-generator v0.23.6
85+
k8s.io/component-base => k8s.io/component-base v0.23.6
86+
k8s.io/cri-api => k8s.io/cri-api v0.23.6
87+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.6
88+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.6
89+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.6
8790
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.1
8891
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.1
89-
k8s.io/kubelet => k8s.io/kubelet v0.21.11
90-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.11
91-
k8s.io/metrics => k8s.io/metrics v0.21.11
92+
k8s.io/kubelet => k8s.io/kubelet v0.23.6
93+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.6
94+
k8s.io/metrics => k8s.io/metrics v0.23.6
9295
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.1
9396
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
9497
)

0 commit comments

Comments
 (0)