Skip to content

Commit 26998d1

Browse files
authored
Merge pull request #162 from Leaseweb/feat/k8s_1_30
feat: K8s 1.30 support
2 parents 685aa89 + 25cb86a commit 26998d1

File tree

9 files changed

+64
-80
lines changed

9 files changed

+64
-80
lines changed

.github/workflows/pr-check.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
jobs:
77
lint:
88
name: Lint
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010
steps:
11-
- name: Setup up Go 1.x
11+
- name: Setup up Go 1.22
1212
uses: actions/setup-go@v5
1313
with:
14-
go-version: "^1.15"
14+
go-version: "1.22"
1515
- name: Check out code
1616
uses: actions/checkout@v4
1717
- name: golangci-lint
@@ -24,10 +24,10 @@ jobs:
2424
name: Test & Build
2525
runs-on: ubuntu-20.04
2626
steps:
27-
- name: Setup up Go 1.x
27+
- name: Setup up Go 1.22
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: "^1.15"
30+
go-version: "1.22"
3131

3232
- name: Check out code
3333
uses: actions/checkout@v4

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
push:
1616
name: Push images
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818

1919
steps:
2020
- name: Check out code
@@ -67,7 +67,7 @@ jobs:
6767

6868
release:
6969
name: Release
70-
runs-on: ubuntu-20.04
70+
runs-on: ubuntu-24.04
7171

7272
# Run only if previous job has succeeded
7373
needs: [push]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ test-sanity:
5353
setup-external-e2e: test/e2e/e2e.test test/e2e/ginkgo
5454

5555
test/e2e/e2e.test test/e2e/ginkgo:
56-
curl --location https://dl.k8s.io/v1.27.5/kubernetes-test-linux-amd64.tar.gz | \
56+
curl --location https://dl.k8s.io/v1.30.5/kubernetes-test-linux-amd64.tar.gz | \
5757
tar --strip-components=3 -C test/e2e -zxf - kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo
5858

5959
.PHONY: test-e2e

charts/cloudstack-csi/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: cloudstack-csi
33
description: A Helm chart for CloudStack CSI driver
44
type: application
5-
version: 2.1.0
6-
appVersion: 0.7.0
5+
version: 2.2.0
6+
appVersion: 0.8.0
77
sources:
88
- https://github.com/Leaseweb/cloudstack-csi-driver
99
keywords:

charts/cloudstack-csi/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ sidecars:
2525
image:
2626
pullPolicy: IfNotPresent
2727
repository: registry.k8s.io/sig-storage/csi-provisioner
28-
tag: "v5.0.1"
28+
tag: "v5.0.2"
2929
logLevel: 2
3030
# Feature gates to enable
3131
featureGates: "Topology=true"
@@ -76,7 +76,7 @@ sidecars:
7676
image:
7777
pullPolicy: IfNotPresent
7878
repository: registry.k8s.io/sig-storage/livenessprobe
79-
tag: "v2.12.0"
79+
tag: "v2.13.1"
8080
# Extra arguments passed to livenessprobe.
8181
extraArgs: []
8282
resources: {}
@@ -88,7 +88,7 @@ sidecars:
8888
image:
8989
pullPolicy: IfNotPresent
9090
repository: registry.k8s.io/sig-storage/csi-resizer
91-
tag: "v1.11.1"
91+
tag: "v1.11.2"
9292
# Tune leader lease election for csi-resizer.
9393
# Leader election is on by default.
9494
leaderElection:
@@ -113,7 +113,7 @@ sidecars:
113113
image:
114114
pullPolicy: IfNotPresent
115115
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
116-
tag: "v2.10.1"
116+
tag: "v2.11.1"
117117
logLevel: 2
118118
# Extra arguments passed to node-driver-registrar.
119119
extraArgs: []

deploy/k8s/controller-deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ spec:
100100
allowPrivilegeEscalation: false
101101

102102
- name: external-provisioner
103-
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
103+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
104104
imagePullPolicy: IfNotPresent
105105
args:
106106
- "--v=4"
@@ -153,7 +153,7 @@ spec:
153153
allowPrivilegeEscalation: false
154154

155155
- name: external-resizer
156-
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
156+
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
157157
args:
158158
- "--v=5"
159159
- "--csi-address=$(ADDRESS)"
@@ -178,7 +178,7 @@ spec:
178178
allowPrivilegeEscalation: false
179179

180180
- name: liveness-probe
181-
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
181+
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
182182
args:
183183
- "--v=4"
184184
- "--csi-address=$(ADDRESS)"

deploy/k8s/node-daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ spec:
9393
privileged: true
9494

9595
- name: node-driver-registrar
96-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
96+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
9797
imagePullPolicy: IfNotPresent
9898
args:
9999
- "--csi-address=$(ADDRESS)"
@@ -134,7 +134,7 @@ spec:
134134
allowPrivilegeEscalation: false
135135

136136
- name: liveness-probe
137-
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
137+
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
138138
imagePullPolicy: IfNotPresent
139139
args:
140140
- "--v=4"

go.mod

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
module github.com/leaseweb/cloudstack-csi-driver
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.8
46

57
require (
68
github.com/apache/cloudstack-go/v2 v2.16.1
79
github.com/container-storage-interface/spec v1.9.0
810
github.com/hashicorp/go-uuid v1.0.3
9-
github.com/kubernetes-csi/csi-lib-utils v0.17.0
11+
github.com/kubernetes-csi/csi-lib-utils v0.18.1
1012
github.com/kubernetes-csi/csi-test/v5 v5.2.0
1113
github.com/spf13/pflag v1.0.5
12-
golang.org/x/sys v0.24.0
13-
golang.org/x/text v0.17.0
14+
golang.org/x/sys v0.26.0
15+
golang.org/x/text v0.19.0
1416
google.golang.org/grpc v1.65.0
1517
gopkg.in/gcfg.v1 v1.2.3
16-
k8s.io/api v0.29.8
17-
k8s.io/apimachinery v0.29.8
18-
k8s.io/client-go v0.29.8
19-
k8s.io/component-base v0.29.8
20-
k8s.io/klog/v2 v2.110.1
21-
k8s.io/mount-utils v0.29.8
18+
k8s.io/api v0.30.5
19+
k8s.io/apimachinery v0.30.5
20+
k8s.io/client-go v0.30.5
21+
k8s.io/component-base v0.30.5
22+
k8s.io/klog/v2 v2.120.1
23+
k8s.io/mount-utils v0.30.5
2224
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2325
)
2426

@@ -28,8 +30,8 @@ require (
2830
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2931
github.com/davecgh/go-spew v1.1.1 // indirect
3032
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
31-
github.com/go-logr/logr v1.3.0 // indirect
32-
github.com/go-logr/zapr v1.2.3 // indirect
33+
github.com/go-logr/logr v1.4.1 // indirect
34+
github.com/go-logr/zapr v1.3.0 // indirect
3335
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3436
github.com/go-openapi/jsonreference v0.20.2 // indirect
3537
github.com/go-openapi/swag v0.22.3 // indirect
@@ -52,8 +54,8 @@ require (
5254
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5355
github.com/modern-go/reflect2 v1.0.2 // indirect
5456
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
55-
github.com/onsi/ginkgo/v2 v2.13.1 // indirect
56-
github.com/onsi/gomega v1.30.0 // indirect
57+
github.com/onsi/ginkgo/v2 v2.15.0 // indirect
58+
github.com/onsi/gomega v1.31.0 // indirect
5759
github.com/prometheus/client_golang v1.16.0 // indirect
5860
github.com/prometheus/client_model v0.4.0 // indirect
5961
github.com/prometheus/common v0.44.0 // indirect
@@ -72,7 +74,7 @@ require (
7274
gopkg.in/warnings.v0 v0.1.2 // indirect
7375
gopkg.in/yaml.v2 v2.4.0 // indirect
7476
gopkg.in/yaml.v3 v3.0.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
77+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
7678
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7779
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7880
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)