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

Commit 9621605

Browse files
committed
build: Kubernetes 1.24
The biggest change is that the corresponding klog now supports contextual logging, so quite a bit of our custom code can be replaced. kubernetes/kubernetes@9e372bf made the result from NodeSSHHosts random, so we have to copy the relevant code. This is ultimately the cleaner solution and will also enable future enhancements, like supporting more than one master node.
1 parent 305800f commit 9621605

39 files changed

+815
-834
lines changed

go.mod

Lines changed: 58 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,78 @@ module github.com/intel/pmem-csi
33
go 1.16
44

55
require (
6-
github.com/aws/aws-sdk-go v1.35.37 // indirect
76
github.com/container-storage-interface/spec v1.5.0
7+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
8+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
89
github.com/go-bindata/go-bindata v3.1.2+incompatible
9-
github.com/go-logr/logr v0.4.0
10-
github.com/google/go-cmp v0.5.5
10+
github.com/go-logr/logr v1.2.3
11+
github.com/go-openapi/jsonreference v0.20.0 // indirect
12+
github.com/go-openapi/swag v0.21.1 // indirect
13+
github.com/google/gnostic v0.6.8 // indirect
14+
github.com/google/go-cmp v0.5.7
1115
github.com/google/gofuzz v1.2.0 // indirect
12-
github.com/google/uuid v1.2.0
16+
github.com/google/uuid v1.3.0
1317
github.com/kubernetes-csi/csi-lib-utils v0.9.1
1418
github.com/kubernetes-csi/csi-test/v4 v4.2.0
19+
github.com/mailru/easyjson v0.7.7 // indirect
1520
github.com/miekg/dns v1.1.38 // indirect
16-
github.com/onsi/ginkgo v1.16.4
17-
github.com/onsi/gomega v1.13.0
21+
github.com/onsi/ginkgo v1.16.5
22+
github.com/onsi/ginkgo/v2 v2.1.4 // indirect
23+
github.com/onsi/gomega v1.19.0
1824
github.com/operator-framework/operator-lib v0.4.0
19-
github.com/prometheus/client_golang v1.11.0
25+
github.com/prometheus/client_golang v1.12.1
2026
github.com/prometheus/client_model v0.2.0
21-
github.com/prometheus/common v0.26.0
27+
github.com/prometheus/common v0.33.0
2228
github.com/stretchr/testify v1.7.0
23-
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
24-
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
25-
google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea // indirect
26-
google.golang.org/grpc v1.35.0
27-
google.golang.org/protobuf v1.26.0
29+
golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2
30+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
31+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
32+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
33+
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
34+
google.golang.org/grpc v1.40.0
35+
google.golang.org/protobuf v1.28.0
2836
gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
2937
gopkg.in/yaml.v2 v2.4.0
30-
k8s.io/api v0.21.1
31-
k8s.io/apiextensions-apiserver v0.21.2
32-
k8s.io/apimachinery v0.21.1
38+
k8s.io/api v0.24.0
39+
k8s.io/apiextensions-apiserver v0.24.0
40+
k8s.io/apimachinery v0.24.0
3341
k8s.io/client-go v12.0.0+incompatible
34-
k8s.io/component-base v0.21.1
35-
k8s.io/klog/v2 v2.8.0
36-
k8s.io/kube-scheduler v0.21.1
37-
k8s.io/kubectl v0.21.1
38-
k8s.io/kubernetes v1.21.1
39-
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
40-
sigs.k8s.io/controller-runtime v0.9.0
42+
k8s.io/component-base v0.24.0
43+
k8s.io/klog/v2 v2.60.1
44+
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
45+
k8s.io/kube-scheduler v0.24.0
46+
k8s.io/kubectl v1.24.0
47+
k8s.io/kubernetes v1.24.0
48+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
49+
sigs.k8s.io/controller-runtime v0.11.2
4150
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.2.0
42-
sigs.k8s.io/yaml v1.2.0
51+
sigs.k8s.io/yaml v1.3.0
4352
)
4453

4554
replace (
46-
k8s.io/api => k8s.io/api v0.21.1
47-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.1
48-
k8s.io/apimachinery => k8s.io/apimachinery v0.21.1
49-
k8s.io/apiserver => k8s.io/apiserver v0.21.1
50-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.1
51-
k8s.io/client-go => k8s.io/client-go v0.21.1
52-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.1
53-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.1
54-
k8s.io/code-generator => k8s.io/code-generator v0.21.1
55-
k8s.io/component-base => k8s.io/component-base v0.21.1
56-
k8s.io/controller-manager => k8s.io/controller-manager v0.21.1
57-
k8s.io/cri-api => k8s.io/cri-api v0.21.1
58-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.1
59-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.1
60-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.1
61-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.1
62-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.1
63-
k8s.io/kubectl => k8s.io/kubectl v0.21.1
64-
k8s.io/kubelet => k8s.io/kubelet v0.21.1
65-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.1
66-
k8s.io/metrics => k8s.io/metrics v0.21.1
67-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.1
55+
k8s.io/api => k8s.io/api v0.24.0
56+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
57+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
58+
k8s.io/apiserver => k8s.io/apiserver v0.24.0
59+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
60+
k8s.io/client-go => k8s.io/client-go v0.24.0
61+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
62+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
63+
k8s.io/code-generator => k8s.io/code-generator v0.24.0
64+
k8s.io/component-base => k8s.io/component-base v0.24.0
65+
k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
66+
k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
67+
k8s.io/cri-api => k8s.io/cri-api v0.24.0
68+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
69+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
70+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
71+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
72+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
73+
k8s.io/kubectl => k8s.io/kubectl v0.24.0
74+
k8s.io/kubelet => k8s.io/kubelet v0.24.0
75+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
76+
k8s.io/metrics => k8s.io/metrics v0.24.0
77+
k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
78+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
79+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
6880
)
69-
70-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.21.1
71-
72-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.21.1

0 commit comments

Comments
 (0)