support subpath in crd (#212)

Signed-off-by: yandongxiao <yandongxiao@starrocks.com>
StarRocks · Aug 10, 2023 · e4ad3cc · e4ad3cc
1 parent 026dfd7
commit e4ad3cc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/config/crd/bases/starrocks.com_starrocksclusters.yaml b/config/crd/bases/starrocks.com_starrocksclusters.yaml
@@ -1271,6 +1271,10 @@ spec:
                             Gi, GiB, Ti, Ti, Pi, Ei, Ex: `512Mi`.'
                           pattern: (^0|([0-9]*l[.])?[0-9]+((M|G|T|E|P)i))$
                           type: string
+                        subPath:
+                          description: SubPath within the volume from which the container's
+                            volume should be mounted.
+                          type: string
                       required:
                       - name
                       - storageSize
@@ -3215,6 +3219,10 @@ spec:
                             Gi, GiB, Ti, Ti, Pi, Ei, Ex: `512Mi`.'
                           pattern: (^0|([0-9]*l[.])?[0-9]+((M|G|T|E|P)i))$
                           type: string
+                        subPath:
+                          description: SubPath within the volume from which the container's
+                            volume should be mounted.
+                          type: string
                       required:
                       - name
                       - storageSize
@@ -4485,6 +4493,10 @@ spec:
                             Gi, GiB, Ti, Ti, Pi, Ei, Ex: `512Mi`.'
                           pattern: (^0|([0-9]*l[.])?[0-9]+((M|G|T|E|P)i))$
                           type: string
+                        subPath:
+                          description: SubPath within the volume from which the container's
+                            volume should be mounted.
+                          type: string
                       required:
                       - name
                       - storageSize

diff --git a/deploy/starrocks.com_starrocksclusters.yaml b/deploy/starrocks.com_starrocksclusters.yaml
@@ -607,6 +607,8 @@ spec:
                         storageSize:
                           pattern: (^0|([0-9]*l[.])?[0-9]+((M|G|T|E|P)i))$
                           type: string
+                        subPath:
+                          type: string
                       required:
                       - name
                       - storageSize
@@ -1524,6 +1526,8 @@ spec:
                         storageSize:
                           pattern: (^0|([0-9]*l[.])?[0-9]+((M|G|T|E|P)i))$
                           type: string
+                        subPath:
+                          type: string
                       required:
                       - name
                       - storageSize
@@ -2114,6 +2118,8 @@ spec:
                         storageSize:
                           pattern: (^0|([0-9]*l[.])?[0-9]+((M|G|T|E|P)i))$
                           type: string
+                        subPath:
+                          type: string
                       required:
                       - name
                       - storageSize

diff --git a/pkg/apis/starrocks/v1/starrockscluster_types.go b/pkg/apis/starrocks/v1/starrockscluster_types.go
@@ -159,6 +159,9 @@ type StorageVolume struct {
 
 	// MountPath specify the path of volume mount.
 	MountPath string `json:"mountPath,omitempty"`
+
+	// SubPath within the volume from which the container's volume should be mounted.
+	SubPath string `json:"subPath,omitempty"`
 }
 
 // StarRocksClusterList contains a list of StarRocksCluster

diff --git a/pkg/k8sutils/templates/pod/spec.go b/pkg/k8sutils/templates/pod/spec.go
@@ -140,6 +140,7 @@ func MountStorageVolumes(spec v1.SpecInterface) ([]corev1.Volume, []corev1.Volum
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      sv.Name,
 			MountPath: sv.MountPath,
+			SubPath:   sv.SubPath,
 		})
 
 		volumes = append(volumes, corev1.Volume{