Skip to content

feat: K8s 1.35 support #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suhasagasthya wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat: K8s 1.35 support #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e048946
feat(deps): Update k8s deps to v0.34.2 for k8s 1.35 support
suhasagasthya Dec 19, 2025
b075431
feat(lint): Update golangci-lint to 2.7.2
suhasagasthya Jan 7, 2026
99fc799
chore(deps): Bump CSI Sidecar containers
suhasagasthya Jan 7, 2026
5f09492
fix: golanglint-ci bump and lint fixes
suhasagasthya Jan 7, 2026
98b4e31
fix: Add volumeattributesclasses permissions
suhasagasthya Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/chart-lints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Helm
uses: azure/setup-helm@v4.3.1
with:
version: v3.18.6
version: v3.19.4

- uses: actions/setup-python@v6
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- name: Check out code
uses: actions/checkout@v5
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v7
with:
version: v1.64.8
version: v2.7.2
args: --timeout=5m

build:
Expand Down
83 changes: 56 additions & 27 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,6 @@
issues:
exclude-use-default: true
max-issues-per-linter: 50
max-same-issues: 0 # disable
exclude-rules:
- path: _test.go
linters:
- funlen
- gocognit
- gocyclo
- maintidx
- nestif

linters-settings:
gci:
sections:
- standard
- default
- prefix(github.com/leaseweb/cloudstack-csi-driver)
goimports:
local-prefixes: github.com/leaseweb/cloudstack-csi-driver

misspell:
locale: US

version: "2"
linters:
enable-all: true
default: all
disable:
- cyclop
- depguard
Expand All @@ -42,4 +18,57 @@ linters:
- testpackage
- varnamelen
- wrapcheck
- wsl
- wsl
# TODO: The following linters should be enabled in the future
- funcorder
- wsl_v5
- noctx
- noinlineerr
- modernize
- revive
settings:
misspell:
locale: US
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
rules:
- linters:
- funlen
- gocognit
- gocyclo
- maintidx
- nestif
path: _test.go
paths:
- third_party$
- builtin$
- examples$
issues:
max-issues-per-linter: 50
max-same-issues: 0
formatters:
enable:
- gci
- gofmt
- gofumpt
- goimports
settings:
gci:
sections:
- standard
- default
- prefix(github.com/leaseweb/cloudstack-csi-driver)
goimports:
local-prefixes:
- github.com/leaseweb/cloudstack-csi-driver
exclusions:
generated: lax
paths:
- third_party$
- builtin$
- examples$
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ BIN_DIR ?= bin
GO_INSTALL := ./hack/go_install.sh

GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT_VER := v1.64.8
GOLANGCI_LINT_VER := v2.7.2
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/v2/cmd/golangci-lint

MOCKGEN_BIN := mockgen
MOCKGEN_VER := v0.5.2
MOCKGEN_VER := v0.6.0
MOCKGEN := $(abspath $(TOOLS_BIN_DIR)/$(MOCKGEN_BIN)-$(MOCKGEN_VER))
MOCKGEN_PKG := go.uber.org/mock/mockgen

Expand Down Expand Up @@ -102,7 +102,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.33.3/kubernetes-test-linux-amd64.tar.gz | \
curl --location https://dl.k8s.io/v1.34.2/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
2 changes: 1 addition & 1 deletion cmd/cloudstack-csi-driver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.22
FROM alpine:3.23

LABEL \
org.opencontainers.image.description="CloudStack CSI driver" \
Expand Down
2 changes: 1 addition & 1 deletion cmd/cloudstack-csi-sc-syncer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.22
FROM alpine:3.23

LABEL \
org.opencontainers.image.description="CloudStack disk offering to Kubernetes storage class syncer" \
Expand Down
8 changes: 4 additions & 4 deletions deploy/k8s/controller-deployment.yaml
View file
Open in desktop
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.3.0
image: registry.k8s.io/sig-storage/csi-provisioner:v6.1.0
imagePullPolicy: IfNotPresent
args:
- "--v=4"
Expand Down Expand Up @@ -128,7 +128,7 @@ spec:
allowPrivilegeEscalation: false

- name: external-attacher
image: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
imagePullPolicy: IfNotPresent
args:
- "--v=4"
Expand All @@ -153,7 +153,7 @@ spec:
allowPrivilegeEscalation: false

- name: external-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.14.0
image: registry.k8s.io/sig-storage/csi-resizer:v2.0.0
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.16.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
args:
- "--v=4"
- "--csi-address=$(ADDRESS)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/k8s/node-daemonset.yaml
View file
Open in desktop
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.14.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0
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.16.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
imagePullPolicy: IfNotPresent
args:
- "--v=4"
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ rules:
resources: ["leases"]
verbs: ["get", "watch", "list", "delete", "update", "create"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses", "csinodes"]
resources: ["storageclasses", "csinodes", "volumeattributesclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"]
Expand Down
66 changes: 34 additions & 32 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,82 +3,84 @@ module github.com/leaseweb/cloudstack-csi-driver
go 1.24.0

require (
github.com/apache/cloudstack-go/v2 v2.17.1
github.com/container-storage-interface/spec v1.10.0
github.com/apache/cloudstack-go/v2 v2.19.0
github.com/container-storage-interface/spec v1.12.0
github.com/golang/mock v1.6.0
github.com/hashicorp/go-uuid v1.0.3
github.com/kubernetes-csi/csi-test/v5 v5.3.1
github.com/kubernetes-csi/csi-test/v5 v5.4.0
github.com/spf13/pflag v1.0.7
github.com/stretchr/testify v1.10.0
go.uber.org/mock v0.5.2
golang.org/x/sys v0.34.0
golang.org/x/text v0.27.0
google.golang.org/grpc v1.68.1
github.com/stretchr/testify v1.11.1
go.uber.org/mock v0.6.0
golang.org/x/sys v0.35.0
golang.org/x/text v0.28.0
google.golang.org/grpc v1.72.1
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.33.3
k8s.io/apimachinery v0.33.3
k8s.io/client-go v0.33.3
k8s.io/component-base v0.33.3
k8s.io/api v0.34.2
k8s.io/apimachinery v0.34.2
k8s.io/client-go v0.34.2
k8s.io/component-base v0.34.2
k8s.io/klog/v2 v2.130.1
k8s.io/mount-utils v0.33.3
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
k8s.io/mount-utils v0.34.2
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.21.0 // indirect
github.com/onsi/gomega v1.35.1 // indirect
github.com/onsi/ginkgo/v2 v2.22.0 // indirect
github.com/onsi/gomega v1.36.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.41.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.34.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
golang.org/x/tools v0.36.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
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-20250318190949-c8a335a9a2ff // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading