From bf0c8f0c322ba7741ae19d7a4636dd26cfa983f3 Mon Sep 17 00:00:00 2001
From: Enrico Candino <enrico.candino@suse.com>
Date: Wed, 29 Jul 2026 11:17:56 +0200
Subject: [PATCH] Keep PersistentVolumeClaim to "varlibrancherk3s" (#1090)

* Keep PersistentVolumeClaim to "varlibrancherk3s"

* Rename volume name to "varlibrancherk3s" in pod specification
---
 pkg/controller/cluster/server/server.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/controller/cluster/server/server.go b/pkg/controller/cluster/server/server.go
index 057d6d3e..6b193a68 100644
--- a/pkg/controller/cluster/server/server.go
+++ b/pkg/controller/cluster/server/server.go
@@ -192,7 +192,7 @@ func (s *Server) podSpec(ctx context.Context, image, name string, persistent boo
 						ReadOnly:  false,
 					},
 					{
-						Name:      "var-lib-rancher-k3s",
+						Name:      "varlibrancherk3s",
 						MountPath: k3sDataDir,
 						ReadOnly:  false,
 					},
@@ -215,7 +215,7 @@ func (s *Server) podSpec(ctx context.Context, image, name string, persistent boo
 	podSpec.Containers[0].Command = cmd
 	if !persistent {
 		podSpec.Volumes = append(podSpec.Volumes, corev1.Volume{
-			Name: "var-lib-rancher-k3s",
+			Name: "varlibrancherk3s",
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
@@ -433,7 +433,7 @@ func (s *Server) setupDynamicPersistence() corev1.PersistentVolumeClaim {
 			APIVersion: "v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "var-lib-rancher-k3s",
+			Name:      "varlibrancherk3s",
 			Namespace: s.cluster.Namespace,
 		},
 		Spec: corev1.PersistentVolumeClaimSpec{