Skip to content

Commit 02d4251

Browse files
authored
Merge pull request #1094 from mythi/PR-2022-051
bump go mod version to 1.18 and move to k8s.io v1.25.0-rc.0
2 parents 6177dd0 + 9130c5e commit 02d4251

22 files changed

+116
-678
lines changed

go.mod

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/intel/intel-device-plugins-for-kubernetes
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/fsnotify/fsnotify v1.5.4
@@ -9,27 +9,26 @@ require (
99
github.com/google/go-cmp v0.5.8
1010
github.com/google/gousb v1.1.2
1111
github.com/klauspost/cpuid/v2 v2.1.0
12-
github.com/onsi/ginkgo v1.16.5
12+
github.com/onsi/ginkgo/v2 v2.1.4
1313
github.com/onsi/gomega v1.20.0
1414
github.com/pkg/errors v0.9.1
15-
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e
15+
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664
1616
golang.org/x/text v0.3.7
1717
google.golang.org/grpc v1.48.0
18-
k8s.io/api v0.24.2
19-
k8s.io/apimachinery v0.24.2
18+
k8s.io/api v0.25.0-rc.0
19+
k8s.io/apimachinery v0.25.0-rc.0
2020
k8s.io/client-go v1.5.2
21-
k8s.io/component-base v0.24.2
22-
k8s.io/klog/v2 v2.60.1
23-
k8s.io/kubelet v0.24.0
24-
k8s.io/kubernetes v1.24.0
21+
k8s.io/component-base v0.25.0-rc.0
22+
k8s.io/klog/v2 v2.70.1
23+
k8s.io/kubelet v0.25.0-rc.0
24+
k8s.io/kubernetes v1.25.0-rc.0
2525
k8s.io/pod-security-admission v0.0.0
26-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
26+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
2727
sigs.k8s.io/controller-runtime v0.12.3
2828
sigs.k8s.io/yaml v1.3.0
2929
)
3030

3131
require (
32-
cloud.google.com/go v0.81.0 // indirect
3332
github.com/Microsoft/go-winio v0.4.17 // indirect
3433
github.com/PuerkitoBio/purell v1.1.1 // indirect
3534
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -38,7 +37,7 @@ require (
3837
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3938
github.com/davecgh/go-spew v1.1.1 // indirect
4039
github.com/docker/distribution v2.8.1+incompatible // indirect
41-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
40+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
4241
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4342
github.com/felixge/httpsnoop v1.0.1 // indirect
4443
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -61,7 +60,6 @@ require (
6160
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6261
github.com/modern-go/reflect2 v1.0.2 // indirect
6362
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
64-
github.com/nxadm/tail v1.4.8 // indirect
6563
github.com/opencontainers/go-digest v1.0.0 // indirect
6664
github.com/prometheus/client_golang v1.12.1 // indirect
6765
github.com/prometheus/client_model v0.2.0 // indirect
@@ -79,56 +77,55 @@ require (
7977
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
8078
go.opentelemetry.io/otel/trace v0.20.0 // indirect
8179
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
82-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
83-
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
80+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
81+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
8482
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
8583
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
8684
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
8785
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
8886
google.golang.org/appengine v1.6.7 // indirect
89-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
87+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
9088
google.golang.org/protobuf v1.28.0 // indirect
9189
gopkg.in/inf.v0 v0.9.1 // indirect
92-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9390
gopkg.in/yaml.v2 v2.4.0 // indirect
9491
gopkg.in/yaml.v3 v3.0.1 // indirect
9592
k8s.io/apiextensions-apiserver v0.24.2 // indirect
96-
k8s.io/apiserver v0.24.0 // indirect
97-
k8s.io/component-helpers v0.24.0 // indirect
98-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
93+
k8s.io/apiserver v0.25.0-rc.0 // indirect
94+
k8s.io/component-helpers v0.25.0-rc.0 // indirect
95+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
9996
k8s.io/kubectl v0.0.0 // indirect
100-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
101-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
102-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
97+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
98+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
99+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
103100
)
104101

105102
replace (
106-
k8s.io/api => k8s.io/api v0.24.0
107-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
108-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.1-rc.0
109-
k8s.io/apiserver => k8s.io/apiserver v0.24.0
110-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
111-
k8s.io/client-go => k8s.io/client-go v0.24.0
112-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
113-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
114-
k8s.io/code-generator => k8s.io/code-generator v0.24.1-rc.0
115-
k8s.io/component-base => k8s.io/component-base v0.24.0
116-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
117-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
118-
k8s.io/cri-api => k8s.io/cri-api v0.25.0-alpha.0
119-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
120-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
121-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
122-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
123-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
124-
k8s.io/kubectl => k8s.io/kubectl v0.24.0
125-
k8s.io/kubelet => k8s.io/kubelet v0.24.0
126-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
127-
k8s.io/metrics => k8s.io/metrics v0.24.0
128-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.1-rc.0
129-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
130-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.0
131-
k8s.io/sample-controller => k8s.io/sample-controller v0.24.0
103+
k8s.io/api => k8s.io/api v0.25.0-rc.0
104+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0-rc.0
105+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0-alpha.0
106+
k8s.io/apiserver => k8s.io/apiserver v0.25.0-rc.0
107+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0-rc.0
108+
k8s.io/client-go => k8s.io/client-go v0.25.0-rc.0
109+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0-rc.0
110+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0-rc.0
111+
k8s.io/code-generator => k8s.io/code-generator v0.25.0-rc.0
112+
k8s.io/component-base => k8s.io/component-base v0.25.0-rc.0
113+
k8s.io/component-helpers => k8s.io/component-helpers v0.25.0-rc.0
114+
k8s.io/controller-manager => k8s.io/controller-manager v0.25.0-rc.0
115+
k8s.io/cri-api => k8s.io/cri-api v0.25.0-rc.0
116+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0-rc.0
117+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0-rc.0
118+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0-rc.0
119+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0-rc.0
120+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0-rc.0
121+
k8s.io/kubectl => k8s.io/kubectl v0.25.0-rc.0
122+
k8s.io/kubelet => k8s.io/kubelet v0.25.0-rc.0
123+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0-rc.0
124+
k8s.io/metrics => k8s.io/metrics v0.25.0-rc.0
125+
k8s.io/mount-utils => k8s.io/mount-utils v0.25.0-rc.0
126+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0-rc.0
127+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.0-rc.0
128+
k8s.io/sample-controller => k8s.io/sample-controller v0.25.0-rc.0
132129
)
133130

134-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
131+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0-rc.0

0 commit comments

Comments
 (0)