Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 2e46b90

Browse files
committed
build: update Kubernetes to 1.25
The new e2e.test suite is needed for pod security policy changes when testing against Kubernetes 1.24. It also completes the ginkgo v2 migration.
1 parent 1139525 commit 2e46b90

File tree

30 files changed

+327
-436
lines changed

30 files changed

+327
-436
lines changed

go.mod

Lines changed: 123 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,146 @@
11
module github.com/intel/pmem-csi
22

3-
go 1.16
3+
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.38.71 // indirect
7-
github.com/container-storage-interface/spec v1.5.0
8-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
9-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
10-
github.com/felixge/httpsnoop v1.0.2 // indirect
11-
github.com/fsnotify/fsnotify v1.5.4 // indirect
6+
github.com/container-storage-interface/spec v1.6.0
127
github.com/go-bindata/go-bindata v3.1.2+incompatible
138
github.com/go-logr/logr v1.2.3
14-
github.com/go-logr/zapr v1.2.3 // indirect
15-
github.com/go-openapi/jsonreference v0.20.0 // indirect
16-
github.com/go-openapi/swag v0.21.1 // indirect
17-
github.com/google/gnostic v0.6.9 // indirect
189
github.com/google/go-cmp v0.5.8
19-
github.com/google/gofuzz v1.2.0 // indirect
2010
github.com/google/uuid v1.3.0
2111
github.com/kubernetes-csi/csi-lib-utils v0.9.1
22-
github.com/kubernetes-csi/csi-test/v4 v4.2.0
23-
github.com/mailru/easyjson v0.7.7 // indirect
24-
github.com/miekg/dns v1.1.48 // indirect
25-
github.com/onsi/ginkgo v1.16.5
26-
github.com/onsi/ginkgo/v2 v2.1.4 // indirect
27-
github.com/onsi/gomega v1.19.0
28-
github.com/opencontainers/selinux v1.10.1 // indirect
12+
github.com/kubernetes-csi/csi-test/v5 v5.0.0
13+
github.com/onsi/ginkgo/v2 v2.1.4
14+
github.com/onsi/gomega v1.20.0
2915
github.com/operator-framework/operator-lib v0.4.1
30-
github.com/prometheus/client_golang v1.12.1
16+
github.com/prometheus/client_golang v1.12.2
3117
github.com/prometheus/client_model v0.2.0
3218
github.com/prometheus/common v0.33.0
3319
github.com/stretchr/testify v1.7.1
34-
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
35-
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
36-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
37-
golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba
38-
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
39-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
40-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
41-
google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e // indirect
42-
google.golang.org/grpc v1.45.0
20+
golang.org/x/net v0.0.0-20220802222814-0bcc04d9c69b
21+
golang.org/x/sys v0.0.0-20220731174439-a90be440212d
22+
google.golang.org/grpc v1.48.0
4323
google.golang.org/protobuf v1.28.0
4424
gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
4525
gopkg.in/yaml.v2 v2.4.0
46-
k8s.io/api v0.24.0
47-
k8s.io/apiextensions-apiserver v0.24.0
48-
k8s.io/apimachinery v0.24.0
26+
k8s.io/api v0.25.0
27+
k8s.io/apiextensions-apiserver v0.25.0
28+
k8s.io/apimachinery v0.25.0
4929
k8s.io/client-go v12.0.0+incompatible
50-
k8s.io/component-base v0.24.0
51-
k8s.io/klog/v2 v2.60.1
52-
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
53-
k8s.io/kube-scheduler v0.24.0
54-
k8s.io/kubectl v1.24.0
55-
k8s.io/kubernetes v1.24.0
56-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
57-
sigs.k8s.io/controller-runtime v0.11.2
30+
k8s.io/component-base v0.25.0
31+
k8s.io/klog/v2 v2.70.1
32+
k8s.io/kube-scheduler v0.25.0
33+
k8s.io/kubectl v1.25.0
34+
k8s.io/kubernetes v1.25.0
35+
k8s.io/utils v0.0.0-20220812165043-ad590609e2e5
36+
sigs.k8s.io/controller-runtime v0.12.3
5837
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.2.0
5938
sigs.k8s.io/yaml v1.3.0
6039
)
6140

41+
require (
42+
github.com/aws/aws-sdk-go v1.38.71 // indirect
43+
github.com/beorn7/perks v1.0.1 // indirect
44+
github.com/blang/semver/v4 v4.0.0 // indirect
45+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
46+
github.com/davecgh/go-spew v1.1.1 // indirect
47+
github.com/docker/distribution v2.8.1+incompatible // indirect
48+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
49+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
50+
github.com/felixge/httpsnoop v1.0.2 // indirect
51+
github.com/fsnotify/fsnotify v1.5.4 // indirect
52+
github.com/go-logr/zapr v1.2.3 // indirect
53+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
54+
github.com/go-openapi/jsonreference v0.20.0 // indirect
55+
github.com/go-openapi/swag v0.21.1 // indirect
56+
github.com/gogo/protobuf v1.3.2 // indirect
57+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
58+
github.com/golang/protobuf v1.5.2 // indirect
59+
github.com/google/gnostic v0.6.9 // indirect
60+
github.com/google/gofuzz v1.2.0 // indirect
61+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
62+
github.com/imdario/mergo v0.3.12 // indirect
63+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
64+
github.com/jmespath/go-jmespath v0.4.0 // indirect
65+
github.com/josharian/intern v1.0.0 // indirect
66+
github.com/json-iterator/go v1.1.12 // indirect
67+
github.com/mailru/easyjson v0.7.7 // indirect
68+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
69+
github.com/miekg/dns v1.1.48 // indirect
70+
github.com/moby/spdystream v0.2.0 // indirect
71+
github.com/moby/sys/mountinfo v0.6.0 // indirect
72+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
73+
github.com/modern-go/reflect2 v1.0.2 // indirect
74+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
75+
github.com/opencontainers/go-digest v1.0.0 // indirect
76+
github.com/opencontainers/selinux v1.10.1 // indirect
77+
github.com/pkg/errors v0.9.1 // indirect
78+
github.com/pmezard/go-difflib v1.0.0 // indirect
79+
github.com/prometheus/procfs v0.7.3 // indirect
80+
github.com/spf13/cobra v1.4.0 // indirect
81+
github.com/spf13/pflag v1.0.5 // indirect
82+
go.opentelemetry.io/contrib v0.20.0 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
84+
go.opentelemetry.io/otel v0.20.0 // indirect
85+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
86+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
87+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
88+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
89+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
90+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
91+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
92+
go.uber.org/atomic v1.7.0 // indirect
93+
go.uber.org/multierr v1.6.0 // indirect
94+
go.uber.org/zap v1.21.0 // indirect
95+
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
96+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
97+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
98+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
99+
golang.org/x/text v0.3.7 // indirect
100+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
101+
golang.org/x/tools v0.1.12 // indirect
102+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
103+
google.golang.org/appengine v1.6.7 // indirect
104+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
105+
gopkg.in/inf.v0 v0.9.1 // indirect
106+
gopkg.in/yaml.v3 v3.0.1 // indirect
107+
k8s.io/apiserver v0.25.0 // indirect
108+
k8s.io/cloud-provider v0.0.0 // indirect
109+
k8s.io/component-helpers v0.25.0 // indirect
110+
k8s.io/csi-translation-lib v0.0.0 // indirect
111+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
112+
k8s.io/kubelet v0.0.0 // indirect
113+
k8s.io/mount-utils v0.0.0 // indirect
114+
k8s.io/pod-security-admission v0.0.0 // indirect
115+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
116+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
117+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
118+
)
119+
62120
replace (
63-
k8s.io/api => k8s.io/api v0.24.0
64-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
65-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
66-
k8s.io/apiserver => k8s.io/apiserver v0.24.0
67-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
68-
k8s.io/client-go => k8s.io/client-go v0.24.0
69-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
70-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
71-
k8s.io/code-generator => k8s.io/code-generator v0.24.0
72-
k8s.io/component-base => k8s.io/component-base v0.24.0
73-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
74-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
75-
k8s.io/cri-api => k8s.io/cri-api v0.24.0
76-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
77-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
78-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
79-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
80-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
81-
k8s.io/kubectl => k8s.io/kubectl v0.24.0
82-
k8s.io/kubelet => k8s.io/kubelet v0.24.0
83-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
84-
k8s.io/metrics => k8s.io/metrics v0.24.0
85-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
86-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
87-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
121+
k8s.io/api => k8s.io/api v0.25.0
122+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0
123+
k8s.io/apimachinery => k8s.io/apimachinery v0.25.0
124+
k8s.io/apiserver => k8s.io/apiserver v0.25.0
125+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0
126+
k8s.io/client-go => k8s.io/client-go v0.25.0
127+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0
128+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0
129+
k8s.io/code-generator => k8s.io/code-generator v0.25.0
130+
k8s.io/component-base => k8s.io/component-base v0.25.0
131+
k8s.io/component-helpers => k8s.io/component-helpers v0.25.0
132+
k8s.io/controller-manager => k8s.io/controller-manager v0.25.0
133+
k8s.io/cri-api => k8s.io/cri-api v0.25.0
134+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0
135+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
136+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0
137+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
138+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0
139+
k8s.io/kubectl => k8s.io/kubectl v0.25.0
140+
k8s.io/kubelet => k8s.io/kubelet v0.25.0
141+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0
142+
k8s.io/metrics => k8s.io/metrics v0.25.0
143+
k8s.io/mount-utils => k8s.io/mount-utils v0.25.0
144+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
145+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0
88146
)

0 commit comments

Comments
 (0)