Skip to content

Commit

Permalink
Merge pull request #162 from Leaseweb/feat/k8s_1_30
Browse files Browse the repository at this point in the history
feat: K8s 1.30 support
  • Loading branch information
hrak authored Oct 14, 2024
2 parents 685aa89 + 25cb86a commit 26998d1
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 80 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pr-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Setup up Go 1.x
- name: Setup up Go 1.22
uses: actions/setup-go@v5
with:
go-version: "^1.15"
go-version: "1.22"
- name: Check out code
uses: actions/checkout@v4
- name: golangci-lint
Expand All @@ -24,10 +24,10 @@ jobs:
name: Test & Build
runs-on: ubuntu-20.04
steps:
- name: Setup up Go 1.x
- name: Setup up Go 1.22
uses: actions/setup-go@v5
with:
go-version: "^1.15"
go-version: "1.22"

- name: Check out code
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
push:
name: Push images
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Check out code
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

release:
name: Release
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

# Run only if previous job has succeeded
needs: [push]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test-sanity:
setup-external-e2e: test/e2e/e2e.test test/e2e/ginkgo

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

.PHONY: test-e2e
Expand Down
4 changes: 2 additions & 2 deletions charts/cloudstack-csi/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: cloudstack-csi
description: A Helm chart for CloudStack CSI driver
type: application
version: 2.1.0
appVersion: 0.7.0
version: 2.2.0
appVersion: 0.8.0
sources:
- https://github.com/Leaseweb/cloudstack-csi-driver
keywords:
Expand Down
8 changes: 4 additions & 4 deletions charts/cloudstack-csi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sidecars:
image:
pullPolicy: IfNotPresent
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: "v5.0.1"
tag: "v5.0.2"
logLevel: 2
# Feature gates to enable
featureGates: "Topology=true"
Expand Down Expand Up @@ -76,7 +76,7 @@ sidecars:
image:
pullPolicy: IfNotPresent
repository: registry.k8s.io/sig-storage/livenessprobe
tag: "v2.12.0"
tag: "v2.13.1"
# Extra arguments passed to livenessprobe.
extraArgs: []
resources: {}
Expand All @@ -88,7 +88,7 @@ sidecars:
image:
pullPolicy: IfNotPresent
repository: registry.k8s.io/sig-storage/csi-resizer
tag: "v1.11.1"
tag: "v1.11.2"
# Tune leader lease election for csi-resizer.
# Leader election is on by default.
leaderElection:
Expand All @@ -113,7 +113,7 @@ sidecars:
image:
pullPolicy: IfNotPresent
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: "v2.10.1"
tag: "v2.11.1"
logLevel: 2
# Extra arguments passed to node-driver-registrar.
extraArgs: []
Expand Down
6 changes: 3 additions & 3 deletions deploy/k8s/controller-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
allowPrivilegeEscalation: false

- name: external-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
imagePullPolicy: IfNotPresent
args:
- "--v=4"
Expand Down Expand Up @@ -153,7 +153,7 @@ spec:
allowPrivilegeEscalation: false

- name: external-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand All @@ -178,7 +178,7 @@ spec:
allowPrivilegeEscalation: false

- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
args:
- "--v=4"
- "--csi-address=$(ADDRESS)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/k8s/node-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
privileged: true

- name: node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
imagePullPolicy: IfNotPresent
args:
- "--csi-address=$(ADDRESS)"
Expand Down Expand Up @@ -134,7 +134,7 @@ spec:
allowPrivilegeEscalation: false

- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
imagePullPolicy: IfNotPresent
args:
- "--v=4"
Expand Down
32 changes: 17 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
module github.com/leaseweb/cloudstack-csi-driver

go 1.21
go 1.22.0

toolchain go1.22.8

require (
github.com/apache/cloudstack-go/v2 v2.16.1
github.com/container-storage-interface/spec v1.9.0
github.com/hashicorp/go-uuid v1.0.3
github.com/kubernetes-csi/csi-lib-utils v0.17.0
github.com/kubernetes-csi/csi-lib-utils v0.18.1
github.com/kubernetes-csi/csi-test/v5 v5.2.0
github.com/spf13/pflag v1.0.5
golang.org/x/sys v0.24.0
golang.org/x/text v0.17.0
golang.org/x/sys v0.26.0
golang.org/x/text v0.19.0
google.golang.org/grpc v1.65.0
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.29.8
k8s.io/apimachinery v0.29.8
k8s.io/client-go v0.29.8
k8s.io/component-base v0.29.8
k8s.io/klog/v2 v2.110.1
k8s.io/mount-utils v0.29.8
k8s.io/api v0.30.5
k8s.io/apimachinery v0.30.5
k8s.io/client-go v0.30.5
k8s.io/component-base v0.30.5
k8s.io/klog/v2 v2.120.1
k8s.io/mount-utils v0.30.5
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
)

Expand All @@ -28,8 +30,8 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand All @@ -52,8 +54,8 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.13.1 // indirect
github.com/onsi/gomega v1.30.0 // indirect
github.com/onsi/ginkgo/v2 v2.15.0 // indirect
github.com/onsi/gomega v1.31.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
Expand All @@ -72,7 +74,7 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
Loading

0 comments on commit 26998d1

Please sign in to comment.