merge master

Author: jack munday

.github/workflows/ci-test-go.yaml

@@ -0,0 +1,65 @@
+name: ci-test-golang
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      - "master"
+  # Allows for manual triggers using the `gh` CLI.
+  workflow_dispatch:
+env:
+  GO_VERSION: "1.24"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Run go vet
+        run: go vet ./...
+
+      - name: Run go test
+        run: go test ./... -json > test-results.json
+
+      - name: Publish test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: go-results
+          path: test-results.json
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Verify go mod tidy has been run
+        run: |
+          set -e
+          go mod tidy
+          if [ ! -z "$(git status --porcelain go.mod go.sum)" ]; then
+              >&2 echo "Running go mod tidy modified go.mod and/or go.sum"
+              exit 1
+          fi
+
+      - name: Verify gofumpt has been run
+        run: |
+          set -e
+          go install mvdan.cc/gofumpt@latest
+          gofumpt -l -w .
+          if [ ! -z "$(git status --porcelain .)" ]; then
+              >&2 echo "Running gofumpt modified source code"
+              exit 1
+          fi

.gitlab-ci.yml

@@ -15,7 +15,7 @@ build-bin:
   stage: build-bin
   rules:
   - if: $CI_COMMIT_BRANCH || $CI_COMMIT_TAG
-  image: registry.cern.ch/docker.io/library/golang:1.22
+  image: registry.cern.ch/docker.io/library/golang:1.24
   artifacts:
     expire_in: '10 min'
     paths:
@@ -48,20 +48,19 @@ build-chart:
     variables:
       PUSH_CHART: "true"
   - if: $CI_COMMIT_BRANCH
-  image: registry.cern.ch/kubernetes/ops:0.4.0
+  image: registry.cern.ch/kubernetes/ops:0.6.0
   stage: build-chart
   script: |
     CHART_NAME=cvmfs-csi
-    CHART_VERSION=$(grep '^version:' "deployments/helm/${CHART_NAME}/Chart.yaml" | awk '{print $2}')
     helm package "deployments/helm/${CHART_NAME}"
 
     if $PUSH_CHART; then
       helm registry login registry.cern.ch -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-      helm push ${CHART_NAME}-${CHART_VERSION}.tgz "oci://${REGISTRY_CHART_PATH}"
+      helm push ${CHART_NAME}-${CI_COMMIT_TAG}.tgz "oci://${REGISTRY_CHART_PATH}"
 
       echo -n "${HARBOR_SIGNKEY}" | base64 -d > .sign.key
       cosign login registry.cern.ch -u ${HARBOR_USER} -p ${HARBOR_TOKEN}
-      cosign sign --key .sign.key -y "${REGISTRY_CHART_PATH}/${CHART_NAME}:${CHART_VERSION}"
+      cosign sign --key .sign.key -y "${REGISTRY_CHART_PATH}/${CHART_NAME}:${CI_COMMIT_TAG}"
     fi
   variables:
     REGISTRY_CHART_PATH: registry.cern.ch/kubernetes/charts

Makefile

@@ -20,6 +20,7 @@ BINDIR           := $(CURDIR)/bin
 DIST_DIRS        := find * -type d -exec
 TARGETS          ?= linux/amd64 linux/arm64
 IMAGE_BUILD_TOOL ?= podman
+IMAGE_ADDITIONAL_ARGS ?=
 GOX_PARALLEL     ?= 3
 
 GOPATH        = $(shell go env GOPATH)
@@ -50,6 +51,7 @@ endif
 BINARY_VERSION ?= ${GIT_TAG}
 
 BASE_PKG = github.com/cvmfs-contrib/cvmfs-csi
+BASE_REPOSITORY ?= registry.cern.ch/kubernetes/cvmfs-csi
 # Only set Version if building a tag or VERSION is set
 ifneq ($(BINARY_VERSION),)
 	LDFLAGS += -X ${BASE_PKG}/internal/version.version=${BINARY_VERSION}
@@ -62,7 +64,8 @@ endif
 LDFLAGS += -X ${BASE_PKG}/internal/version.commit=${GIT_COMMIT}
 LDFLAGS += -X ${BASE_PKG}/internal/version.treestate=${GIT_DIRTY}
 
-IMAGE_TAG := ${GIT_BRANCH}
+# Replaces all "/" in git branch name with "-": docker tags can not contain a "/".
+IMAGE_TAG := $(shell echo $(GIT_BRANCH) | sed 's/\//-/g')
 ifneq ($(GIT_TAG),)
     IMAGE_TAG = ${GIT_TAG}
 endif
@@ -80,7 +83,7 @@ all: build
 # ------------------------------------------------------------------------------
 #  build
 
-build: TARGETS = $(LOCAL_TARGET)
+# build: TARGETS = $(LOCAL_TARGET)
 build: build-cross
 
 $(BINDIR)/csi-cvmfsplugin: $(SRC)
@@ -107,11 +110,12 @@ build-cross: $(GOX) $(SRC)
 #  image
 
 image: build
-	$(IMAGE_BUILD_TOOL) build                                      \
+	$(IMAGE_BUILD_TOOL) build                                    \
 		--build-arg RELEASE=$(IMAGE_TAG)                           \
 		--build-arg GITREF=$(GIT_COMMIT)                           \
 		--build-arg CREATED=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
-		-t registry.cern.ch/kubernetes/cvmfs-csi:$(IMAGE_TAG)      \
+		$(IMAGE_ADDITIONAL_ARGS)                                   \
+		-t $(BASE_REPOSITORY):$(IMAGE_TAG)                         \
 		-f ./deployments/docker/Dockerfile .
 
 # ------------------------------------------------------------------------------

deployments/docker/Dockerfile

@@ -1,8 +1,8 @@
-FROM registry.access.redhat.com/ubi9/ubi:9.4-947
+FROM registry.access.redhat.com/ubi9/ubi:9.6-1745489786
 
 ARG TARGETARCH
-ARG REL_VERSION=2.11.3
-ARG PKG_VERSION=2.11.3-1
+ARG REL_VERSION=2.12.7
+ARG PKG_VERSION=2.12.7-1
 
 RUN if [[ "${TARGETARCH}" == "amd64" ]]; then \
     export FRIENDLY_ARCH_NAME="x86_64" ; \

deployments/helm/README.md

@@ -1,3 +1,5 @@
+# cvmfs-csi
+
 A Helm chart for the CVMFS-CSI driver, allowing the mounting of CVMFS repositories in Kubernetes environments. This chart will deploy the CSI driver as a DaemonSet, thus automatically scaling the driver on each cluster node.
 
 ## Usage
@@ -47,9 +49,11 @@ Alternatively, a YAML file that specifies the values of the parameters can be pr
 | `cvmfsConfig."config.d".use` | Whether to use this ConfigMap in /etc/cvmfs/config.d.                                                                                  |
 | `cvmfsConfig."config.d".create` | Whether to create config.d ConfigMap. If not, and `use` is set to true, it is expected the ConfigMap is already present.            |
 | `cvmfsConfig."config.d".data` | config.d ConfigMap contents to use when `create` is set to true.                                                                      |
+| `cache.local.location` | Location of the local cvmfs cache i.e. `CVMFS_CACHE_BASE`.
 | `cache.local.volumeSpec` | Volume spec for local cache. ReadWriteOnce access mode for persistent volumes is sufficient.                                               |
 | `cache.local.cvmfsQuotaLimit` | Maximum size of local cache in MiB. CVMFS client will garbage collect the exceeding amount.                                           |
 | `cache.alien.enabled` | Whether to use alien cache in deployment.                                                                                                     |
+| `cache.alien.location` | Location of the alien cvmfs cache if enabled i.e. `CVMFS_ALIEN_CACHE`.
 | `cache.alien.volumeSpec` | Volume spec for local cache. ReadWriteMany access mode for persistent volumes is required.                                                 |
 | `nodeplugin.name` | Component name for node plugin component. Used as `component` label value and to generate DaemonSet name.                                         |
 | `nodeplugin.plugin.image.repository` | Container image repository for CVMFS CSI node plugin.                                                                          |

deployments/helm/cvmfs-csi/templates/nodeplugin-daemonset.yaml

@@ -121,10 +121,10 @@ spec:
               mountPath: /cvmfs
               mountPropagation: Bidirectional
             - name: cvmfs-localcache
-              mountPath: /cvmfs-localcache
+              mountPath: {{ .Values.cache.local.location }}
             {{- if .Values.cache.alien.enabled }}
             - name: cvmfs-aliencache
-              mountPath: /cvmfs-aliencache
+              mountPath: {{ .Values.cache.alien.location }}
             {{- end }}
             {{- with .Values.nodeplugin.automount.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
@@ -149,7 +149,7 @@ spec:
               mountPath: /cvmfs
               mountPropagation: Bidirectional
             - name: cvmfs-localcache
-              mountPath: /cvmfs-localcache
+              mountPath: {{ .Values.cache.local.location }}
             {{- with .Values.nodeplugin.automountReconciler.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}

deployments/helm/cvmfs-csi/values.yaml

@@ -13,13 +13,13 @@ extraConfigMaps:
       CVMFS_USE_GEOAPI=yes
       CVMFS_HTTP_PROXY="http://ca-proxy.cern.ch:3128"
 
-      # It is advised to change these configs in the cache section of the helm values
-      # and leave them unchanged here, so they auto-generate.
+      # It is advised to change these configurations in the cache section of
+      # the helm values and leave them unchanged here, so they auto-generate.
       CVMFS_QUOTA_LIMIT={{ .Values.cache.local.cvmfsQuotaLimit }}
-      CVMFS_CACHE_BASE=/cvmfs-localcache
+      CVMFS_CACHE_BASE={{ .Values.cache.local.location }}
 
       {{- if .Values.cache.alien.enabled }}
-      CVMFS_ALIEN_CACHE=/cvmfs-aliencache
+      CVMFS_ALIEN_CACHE={{ .Values.cache.alien.location }}
       # When alien cache is used, CVMFS does not control the size of the cache.
       CVMFS_QUOTA_LIMIT=-1
       # Whether repositories should share a cache directory or each have their own.
@@ -46,6 +46,7 @@ extraConfigMaps:
 #   https://cvmfs.readthedocs.io/en/stable/cpt-configure.html#alien-cache
 cache:
   local:
+    location: /cvmfs-localcache
     volumeSpec:
       hostPath:
         path: /var/lib/cvmfs.csi.cern.ch/cache
@@ -55,6 +56,7 @@ cache:
     cvmfsQuotaLimit: 1000
   alien:
     enabled: false
+    location: /cvmfs-aliencache
     volumeSpec:
       persistentVolumeClaim:
         claimName: cvmfs-alien-cache

go.mod

@@ -1,27 +1,25 @@
 module github.com/cvmfs-contrib/cvmfs-csi
 
-go 1.22.0
+go 1.24.0
 
-toolchain go1.22.2
+toolchain go1.24.3
 
 require (
-	github.com/container-storage-interface/spec v1.9.0
-	github.com/kubernetes-csi/csi-lib-utils v0.17.0
-	github.com/moby/sys/mountinfo v0.7.1
-	google.golang.org/grpc v1.63.2
-	google.golang.org/protobuf v1.34.0
-	k8s.io/apimachinery v0.30.0
-	k8s.io/klog/v2 v2.120.1
-	k8s.io/mount-utils v0.30.0
+	github.com/container-storage-interface/spec v1.11.0
+	github.com/kubernetes-csi/csi-lib-utils v0.21.0
+	github.com/moby/sys/mountinfo v0.7.2
+	google.golang.org/grpc v1.72.1
+	google.golang.org/protobuf v1.36.6
+	k8s.io/apimachinery v0.33.1
+	k8s.io/klog/v2 v2.130.1
+	k8s.io/mount-utils v0.33.1
 )
 
 require (
-	github.com/go-logr/logr v1.4.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
-	k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
+	k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
 )