fix: allow / in mountPoint

apecloud · Feb 3, 2025 · 80606a4 · 80606a4
1 parent b7b4255
commit 80606a4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go
@@ -350,7 +350,7 @@ type ResourceMeta struct {
 	//
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MaxLength=256
-	// +kubebuilder:validation:Pattern:=`^/[a-z]([a-z0-9\-]*[a-z0-9])?$`
+	// +kubebuilder:validation:Pattern:=`^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$`
 	MountPoint string `json:"mountPoint"`
 
 	// SubPath specifies a path within the volume from which to mount.

diff --git a/config/crd/bases/apps.kubeblocks.io_clusters.yaml b/config/crd/bases/apps.kubeblocks.io_clusters.yaml
@@ -22042,7 +22042,7 @@ spec:
                                 description: MountPoint is the filesystem path where
                                   the volume will be mounted.
                                 maxLength: 256
-                                pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                 type: string
                               name:
                                 description: Name is the name of the referenced ConfigMap
@@ -22079,7 +22079,7 @@ spec:
                                 description: MountPoint is the filesystem path where
                                   the volume will be mounted.
                                 maxLength: 256
-                                pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                 type: string
                               name:
                                 description: Name is the name of the referenced ConfigMap
@@ -31278,7 +31278,7 @@ spec:
                                     description: MountPoint is the filesystem path
                                       where the volume will be mounted.
                                     maxLength: 256
-                                    pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                    pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                     type: string
                                   name:
                                     description: Name is the name of the referenced
@@ -31316,7 +31316,7 @@ spec:
                                     description: MountPoint is the filesystem path
                                       where the volume will be mounted.
                                     maxLength: 256
-                                    pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                    pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                     type: string
                                   name:
                                     description: Name is the name of the referenced

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,6 +5,11 @@ generatorOptions:
   disableNameSuffixHash: true
 
 configMapGenerator:
-- name: manager-config
-  files:
+- files:
   - controller_manager_config.yaml
+  name: manager-config
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: docker.io/apecloud/kubeblocks
diff --git a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
@@ -22042,7 +22042,7 @@ spec:
                                 description: MountPoint is the filesystem path where
                                   the volume will be mounted.
                                 maxLength: 256
-                                pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                 type: string
                               name:
                                 description: Name is the name of the referenced ConfigMap
@@ -22079,7 +22079,7 @@ spec:
                                 description: MountPoint is the filesystem path where
                                   the volume will be mounted.
                                 maxLength: 256
-                                pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                 type: string
                               name:
                                 description: Name is the name of the referenced ConfigMap
@@ -31278,7 +31278,7 @@ spec:
                                     description: MountPoint is the filesystem path
                                       where the volume will be mounted.
                                     maxLength: 256
-                                    pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                    pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                     type: string
                                   name:
                                     description: Name is the name of the referenced
@@ -31316,7 +31316,7 @@ spec:
                                     description: MountPoint is the filesystem path
                                       where the volume will be mounted.
                                     maxLength: 256
-                                    pattern: ^/[a-z]([a-z0-9\-]*[a-z0-9])?$
+                                    pattern: ^/[a-z]([a-z0-9\-\/]*[a-z0-9])?$
                                     type: string
                                   name:
                                     description: Name is the name of the referenced