sync CCM<>CSI test cluster setup, add integration tests on schedule by mweibel · Pull Request #175 · cloudscale-ch/csi-cloudscale

mweibel · 2026-09-02T15:00:54Z

test-matrix has a few differences:

uses 1.28 and the latest two Kubernetes versions for testing to cover README.md documented cluster versions
uses different subnets and cluster prefix to avoid potential mismatching between ccm and CSI (they're in separate projects anyway though)

…longer until volume is usable

alakae · 2026-09-11T08:13:11Z

-# Copyright 2018 DigitalOcean
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.


Other inherited file keeps the notice: driver/*.go and main.go all use the
same two-line form:

# Copyright cloudscale.ch # Copyright 2018 DigitalOcean

Can you restore it please restore it?

alakae · 2026-09-11T09:36:40Z

+RUN go mod download
+
+# Copy all source code
+COPY . .


While overall the new Dockerfile is definitely an improvement, I think we should explicitly COPY the files we require for the build rather than COPY . . + .dockerignore:

COPY Makefile ./ COPY driver/ driver/ COPY cmd/ cmd/

Reasoning:

Directories like .idea/ and similar is gitignored (on my machine) but not dockerignored, so it ships into every build. And breaks layer caching.

I had a stray ./test-venv with test-venv/.gitignore containing *. This was included in the COPY. But its links point to /opt/homebrew which means the build fails in sbx.

A file I'd genuinely. gitignore is cmd/cloudscale-csi-plugin/cloudscale-csi-plugin from the old version of the Dockerfile. It's huge and included in every build.

alakae · 2026-09-11T10:48:01Z

-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+FROM golang:1.27-alpine AS builder


There are a few things coming into play here:

First of all: in the Makefile there is now an unused GO_VERSION := $(shell awk '/^go/ {print $$2}' go.mod). IMHO okay to remove it, but it's currently dead. That approach stopped working with GOTOOLCHAIN=local anyways.

We should probably pin a patch version here and set GOTOOLCHAIN=local.

We should reconsider an earlier decision of ignoring patch versions for docker ecosystem in the dependabot config. Or not pin a patch version?

Happy to discuss :)

alakae · 2026-09-11T11:01:43Z

@@ -1,130 +0,0 @@
-#!/usr/bin/env bash


deploy/README.md should reflect the deletion of this file.

alakae · 2026-09-11T12:37:18Z

+To run the integration tests locally with your local CSI build:

-```
-$ export KUBECONFIG=$(pwd)/kubeconfig 
+```bash
+# 1. Build and export the CSI image
+$ VERSION=dev make publish
+
+# 2. Create a test cluster with CCM and CSI
+$ export CLOUDSCALE_API_TOKEN=your-token
+$ export IMAGE=quay.io/cloudscalech/cloudscale-csi-plugin:dev
+$ helpers/run-in-test-cluster
+
+# This will:
+# - Create a Kubernetes cluster on cloudscale.ch
+# - Deploy CCM from the latest official release
+# - Deploy CSI from your local build
+
+# 3. Run integration tests
+$ export KUBECONFIG=$(pwd)/k8test/cluster/admin.conf
+$ make test-integration
+
+# Run a single test
 $ TESTARGS='-run TestPod_Single_SSD_Volume' make test-integration
+
+# 4. Clean up
+$ helpers/cleanup


replace/merge/move to deploy/README.md (as noted elsewhere)

alakae · 2026-09-11T12:56:20Z

+  echo ""
+
+  # Apply the manifest
+  kubectl apply -n kube-system -f "$manifest_file"


found while diffing against CCM:

# CCM original # CSI port kubectl delete -f /tmp/ccm.yml \ kubectl apply -n kube-system -f "$manifest_file" --ignore-not-found=true kubectl apply -f /tmp/ccm.yml

I think that without the delete kubectl apply -n kube-system -f "$manifest_file"is a no-op.

alakae · 2026-09-11T12:58:32Z

+function build-image() {
+  k8test/playbooks/build-image.yml \
+    -i k8test/cluster/inventory.yml \
+    -e dockerfile=./Dockerfile \
+    -e tag="$IMAGE" \
+    -e extra='--build-arg=VERSION=test' \
+    -l controls
+}


this seems unused:

```bash # CCM original # CSI port if [[ ... == "build" ]]; then if [[ ... == "import" ]]; then build-image import-image else fi import-image fi

why did you choose not implement build-image?

alakae · 2026-09-11T13:03:29Z

+  first_run=$(test ! -f k8test/cluster/inventory.yml && echo "yes" || echo "no")
+
+  ensure-k8test
+  ensure-cluster
+
+  # Deploy components on both new and existing clusters. For new clusters,
+  # this happens after the full cluster bootstrap (including Cilium) is done.
+  deploy-components


noticed while comparing with CCM version:

# CCM original # CSI port first_run=$(...) first_run=$(...) ensure-k8test ensure-k8test ensure-cluster ensure-cluster if [[ "$first_run" == "no" ]]; then deploy-components update-ccm fi

I don't fully remember what first_run guards against in the CCM repo. Can you please research?

alakae · 2026-09-11T13:09:28Z

+	// Kubernetes client
+	k8test, ok := os.LookupEnv("K8TEST_PATH")
+	if !ok {
+		log.Fatalf("could not find K8TEST_PATH environment variable\n")
+	}

-	// if you want to change override values or bind them to flags, there are
-	// methods to help you
-	configOverrides := &clientcmd.ConfigOverrides{}
+	path := filepath.Join(k8test, "cluster", "admin.conf")
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return fmt.Errorf("failed to read kubeconfig at path %q: %w", path, err)
+	}

-	kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
-	var err error
-	config, err = kubeConfig.ClientConfig()
+	config, err = clientcmd.RESTConfigFromKubeConfig(data)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to apply kubeconfig at path %q: %w", path, err)
 	}



Previously: make test-integration would run the test suite in whatever cluster KUBECONFIG was pointing at. Now, make test-integration hard-codes the k8test provisioned cluster.

I think this choice is good for CCM, but in the CSI repo I see use-cases for the opposite: running the test suite on a cluster provisioned some other way (e.g. Rancher, OpenShift) etc..

alakae · 2026-09-11T13:09:51Z

+# - Deploy CSI from your local build
+
+# 3. Run integration tests
+$ export KUBECONFIG=$(pwd)/k8test/cluster/admin.conf


contradicts test/kubernetes/integration_test.go (also noted there)

github-advanced-security Bot found potential problems Sep 2, 2026

View reviewed changes

Comment thread .github/workflows/csi-integration-tests.yml Fixed

mweibel force-pushed the integration-tests branch 4 times, most recently from 15371c4 to 52e7726 Compare September 2, 2026 15:18

mweibel force-pushed the integration-tests branch 14 times, most recently from 6e224fc to ffffb57 Compare September 9, 2026 11:03

mweibel force-pushed the integration-tests branch 3 times, most recently from 272b607 to 5b0d6ee Compare September 9, 2026 14:34

mweibel added 2 commits September 10, 2026 11:52

sync CCM<>CSI test cluster setup, add integration tests on schedule

6de7552

retry getVolumeInfo: TestPod_Single_Bulk_Luks_Volume sometimes takes …

6f0ce8c

…longer until volume is usable

mweibel force-pushed the integration-tests branch from 1c82f68 to 6f0ce8c Compare September 10, 2026 09:52

alakae reviewed Sep 11, 2026

View reviewed changes

Navigation Menu

Uh oh!

sync CCM<>CSI test cluster setup, add integration tests on schedule - #175

sync CCM<>CSI test cluster setup, add integration tests on schedule#175
mweibel wants to merge 2 commits into
align-go-repositoryfrom
integration-tests

mweibel commented Sep 2, 2026

Uh oh!

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

alakae Sep 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

mweibel commented Sep 2, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants