Skip to content

Commit 289acda

Browse files
datamattssondatamattsson
authored
CON-3083 and golang update (#445)
Signed-off-by: Michael Mattsson <michael.mattsson@gmail.com>
1 parent bb98cd4 commit 289acda

Some content is hidden

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

50 files changed

+523
-293
lines changed

‎Dockerfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# throw away builder image
2-
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/ubi:9.5-1732804088 AS build
2+
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/ubi:9.5-1741850090 AS build
3+
4+
# pick golang build version from https://go.dev/dl
5+
ENV BUILDGO=1.24.1
36

47
# install prereqs
5-
RUN dnf install -y make wget golang
8+
RUN dnf install -y make wget
9+
RUN wget -O /tmp/go.tar.gz https://go.dev/dl/go$BUILDGO.linux-amd64.tar.gz && \
10+
tar xzv -C/ -f /tmp/go.tar.gz
11+
ENV PATH=/go/bin:$PATH
612

713
# build driver
814
WORKDIR /usr/src/hpe-csi-driver
@@ -17,7 +23,7 @@ ARG TARGETPLATFORM
1723
RUN make ARCH=$TARGETARCH compile # $TARGETPLATFORM
1824

1925
# image build
20-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1731593028
26+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1741850109
2127

2228
RUN microdnf update -y && rm -rf /var/cache/yum
2329
ADD cmd/csi-driver/AlmaLinux-Base.repo /etc/yum.repos.d/
@@ -68,7 +74,6 @@ RUN ln -s /chroot/chroot-host-wrapper.sh /chroot/blkid \
6874
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/multipathd \
6975
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/umount \
7076
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/ip \
71-
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/dmidecode \
7277
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/dnsdomainname \
7378
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/sg_inq \
7479
&& ln -s /chroot/chroot-host-wrapper.sh /chroot/find

‎go.mod‎

Lines changed: 43 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
module github.com/hpe-storage/csi-driver
22

3-
go 1.20
3+
go 1.23.0
4+
5+
toolchain go1.23.4
46

57
require (
68
github.com/Scalingo/go-etcd-lock v3.0.1+incompatible
79
github.com/container-storage-interface/spec v1.7.0
810
github.com/golang/protobuf v1.5.4
9-
github.com/hpe-storage/common-host-libs v0.0.0-20241220065227-a31a630a0959
11+
github.com/hpe-storage/common-host-libs v0.0.0-20250314084008-293de14a5a79
1012
github.com/hpe-storage/k8s-custom-resources v0.0.0-20240118202512-5f62990a7c2d
1113
github.com/kubernetes-csi/csi-lib-utils v0.11.0
1214
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
1315
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.1.0
1416
github.com/spf13/cobra v1.6.0
1517
github.com/stretchr/testify v1.8.1
1618
golang.org/x/mod v0.17.0
17-
golang.org/x/net v0.23.0
19+
golang.org/x/net v0.25.0
1820
google.golang.org/grpc v1.56.3
1921
k8s.io/api v0.29.0
2022
k8s.io/apimachinery v0.29.0
2123
k8s.io/client-go v0.29.0
2224
k8s.io/kubernetes v1.25.16
25+
k8s.io/mount-utils v0.25.0
26+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2327
)
2428

2529
require (
@@ -75,11 +79,11 @@ require (
7579
github.com/spf13/pflag v1.0.5 // indirect
7680
go.uber.org/multierr v1.10.0 // indirect
7781
go.uber.org/zap v1.26.0 // indirect
78-
golang.org/x/crypto v0.31.0 // indirect
82+
golang.org/x/crypto v0.35.0 // indirect
7983
golang.org/x/oauth2 v0.12.0 // indirect
80-
golang.org/x/sys v0.28.0 // indirect
81-
golang.org/x/term v0.27.0 // indirect
82-
golang.org/x/text v0.21.0 // indirect
84+
golang.org/x/sys v0.30.0 // indirect
85+
golang.org/x/term v0.29.0 // indirect
86+
golang.org/x/text v0.22.0 // indirect
8387
golang.org/x/time v0.5.0 // indirect
8488
google.golang.org/appengine v1.6.7 // indirect
8589
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
@@ -97,69 +101,40 @@ require (
97101
k8s.io/component-helpers v0.25.16 // indirect
98102
k8s.io/klog/v2 v2.110.1 // indirect
99103
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
100-
k8s.io/mount-utils v0.25.0 // indirect
101-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
102104
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103105
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
104106
sigs.k8s.io/yaml v1.3.0 // indirect
105107
)
106108

107-
replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
108-
109-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.16
110-
111-
replace k8s.io/api => k8s.io/api v0.25.16
112-
113-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.0-alpha.0
114-
115-
replace k8s.io/client-go => k8s.io/client-go v0.25.16
116-
117-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.16
118-
119-
replace k8s.io/apiserver => k8s.io/apiserver v0.25.16
120-
121-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.16
122-
123-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.16
124-
125-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.16
126-
127-
replace k8s.io/code-generator => k8s.io/code-generator v0.25.16
128-
129-
replace k8s.io/component-base => k8s.io/component-base v0.25.16
130-
131-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.16
132-
133-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.16
134-
135-
replace k8s.io/cri-api => k8s.io/cri-api v0.25.16
136-
137-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.16
138-
139-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.16
140-
141-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.16
142-
143-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.16
144-
145-
replace k8s.io/kubectl => k8s.io/kubectl v0.25.16
146-
147-
replace k8s.io/kubelet => k8s.io/kubelet v0.25.16
148-
149-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.16
150-
151-
replace k8s.io/metrics => k8s.io/metrics v0.25.16
152-
153-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.16
154-
155-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.16
156-
157-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.16
158-
159-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.16
160-
161-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.16
162-
163-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515
164-
165-
replace google.golang.org/protobuf => google.golang.org/protobuf v1.33.0
109+
replace (
110+
google.golang.org/grpc => google.golang.org/grpc v1.26.0
111+
google.golang.org/protobuf => google.golang.org/protobuf v1.33.0
112+
k8s.io/api => k8s.io/api v0.25.16
113+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.16
114+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0-alpha.0
115+
k8s.io/apiserver => k8s.io/apiserver v0.25.16
116+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.16
117+
k8s.io/client-go => k8s.io/client-go v0.25.16
118+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.16
119+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.16
120+
k8s.io/code-generator => k8s.io/code-generator v0.25.16
121+
k8s.io/component-base => k8s.io/component-base v0.25.16
122+
k8s.io/component-helpers => k8s.io/component-helpers v0.25.16
123+
k8s.io/controller-manager => k8s.io/controller-manager v0.25.16
124+
k8s.io/cri-api => k8s.io/cri-api v0.25.16
125+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.16
126+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.16
127+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.16
128+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515
129+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.16
130+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.16
131+
k8s.io/kubectl => k8s.io/kubectl v0.25.16
132+
k8s.io/kubelet => k8s.io/kubelet v0.25.16
133+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.16
134+
k8s.io/metrics => k8s.io/metrics v0.25.16
135+
k8s.io/mount-utils => k8s.io/mount-utils v0.25.16
136+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.16
137+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.16
138+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.16
139+
k8s.io/sample-controller => k8s.io/sample-controller v0.25.16
140+
)

0 commit comments

Comments
 (0)