Issue 328: Add support of customized volumeMounts for zookeeper container

charts/zookeeper-operator/templates/zookeeper.pravega.io_zookeeperclusters_crd.yaml

@@ -3735,6 +3735,47 @@ spec:
                 - name
                 type: object
               type: array
+            volumeMounts:
+              description: Customized volumeMounts for zookeeper container.
+                Cannot be updated.
+              items:
+                description: VolumeMount describes a mounting of a Volume within
+                  a container.
+                properties:
+                  mountPath:
+                    description: Path within the container at which the volume
+                      should be mounted.  Must not contain ':'.
+                    type: string
+                  mountPropagation:
+                    description: mountPropagation determines how mounts are
+                      propagated from the host to container and the other way
+                      around. When not set, MountPropagationNone is used. This
+                      field is beta in 1.10.
+                    type: string
+                  name:
+                    description: This must match the Name of a Volume.
+                    type: string
+                  readOnly:
+                    description: Mounted read-only if true, read-write otherwise
+                      (false or unspecified). Defaults to false.
+                    type: boolean
+                  subPath:
+                    description: Path within the volume from which the container's
+                      volume should be mounted. Defaults to "" (volume's root).
+                    type: string
+                  subPathExpr:
+                    description: Expanded path within the volume from which
+                      the container's volume should be mounted. Behaves similarly
+                      to SubPath but environment variable references $(VAR_NAME)
+                      are expanded using the container's environment. Defaults
+                      to "" (volume's root). SubPathExpr and SubPath are mutually
+                      exclusive.
+                    type: string
+                required:
+                - mountPath
+                - name
+                type: object
+              type: array
           type: object
         status:
           description: ZookeeperClusterStatus defines the observed state of ZookeeperCluster

charts/zookeeper/README.md

@@ -113,3 +113,4 @@ The following table lists the configurable parameters of the zookeeper chart and
 | `ephemeral.emptydirvolumesource.sizeLimit` | Total amount of local storage required for the EmptyDir volume. | `20Gi` |
 | `containers` | Application containers run with the zookeeper pod | `[]` |
 | `volumes` | Named volumes that may be accessed by any container in the pod | `[]` |
+| `volumeMounts` | Customized volumeMounts for zookeeper container that can be configured to mount volumes to zookeeper container | `[]` |

charts/zookeeper/values.yaml

@@ -95,3 +95,4 @@ hooks:
 
 containers: []
 volumes: []
+volumeMounts: []

deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml

@@ -3731,6 +3731,47 @@ spec:
                 - name
                 type: object
               type: array
+            volumeMounts:
+              description: Customized volumeMounts for zookeeper container.
+                Cannot be updated.
+              items:
+                description: VolumeMount describes a mounting of a Volume within
+                  a container.
+                properties:
+                  mountPath:
+                    description: Path within the container at which the volume
+                      should be mounted.  Must not contain ':'.
+                    type: string
+                  mountPropagation:
+                    description: mountPropagation determines how mounts are
+                      propagated from the host to container and the other way
+                      around. When not set, MountPropagationNone is used. This
+                      field is beta in 1.10.
+                    type: string
+                  name:
+                    description: This must match the Name of a Volume.
+                    type: string
+                  readOnly:
+                    description: Mounted read-only if true, read-write otherwise
+                      (false or unspecified). Defaults to false.
+                    type: boolean
+                  subPath:
+                    description: Path within the volume from which the container's
+                      volume should be mounted. Defaults to "" (volume's root).
+                    type: string
+                  subPathExpr:
+                    description: Expanded path within the volume from which
+                      the container's volume should be mounted. Behaves similarly
+                      to SubPath but environment variable references $(VAR_NAME)
+                      are expanded using the container's environment. Defaults
+                      to "" (volume's root). SubPathExpr and SubPath are mutually
+                      exclusive.
+                    type: string
+                required:
+                - mountPath
+                - name
+                type: object
+              type: array
           type: object
         status:
           description: ZookeeperClusterStatus defines the observed state of ZookeeperCluster

pkg/apis/zookeeper/v1beta1/deepcopy_test.go

@@ -51,6 +51,12 @@ var _ = Describe("ZookeeperCluster DeepCopy", func() {
 						Name: "testvolume",
 					},
 				},
+				VolumeMounts: []v1.VolumeMount{
+					{
+						Name:      "testvolume",
+						MountPath: "/test/volume",
+					},
+				},
 			}
 
 			z1.WithDefaults()

pkg/apis/zookeeper/v1beta1/zookeepercluster_types.go

@@ -136,6 +136,9 @@ type ZookeeperClusterSpec struct {
 	// Volumes defines to support customized volumes
 	Volumes []v1.Volume `json:"volumes,omitempty"`
 
+	// VolumeMounts defines to support customized volumeMounts
+	VolumeMounts []v1.VolumeMount `json:"volumeMounts,omitempty"`
+
 	// Probes specifies the timeout values for the Readiness and Liveness Probes
 	// for the zookeeper pods.
 	// +optional

pkg/zk/generators.go

@@ -142,10 +142,10 @@ func makeZkPodSpec(z *v1beta1.ZookeeperCluster, volumes []v1.Volume) v1.PodSpec
 				Exec: &v1.ExecAction{Command: []string{"zookeeperLive.sh"}},
 			},
 		},
-		VolumeMounts: []v1.VolumeMount{
+		VolumeMounts: append(z.Spec.VolumeMounts, []v1.VolumeMount{
 			{Name: "data", MountPath: "/data"},
 			{Name: "conf", MountPath: "/conf"},
-		},
+		}...),
 		Lifecycle: &v1.Lifecycle{
 			PreStop: &v1.Handler{
 				Exec: &v1.ExecAction{