Enabling ephemeral storage for zookeeper.

pravega · May 2, 2019 · 68336c7 · 68336c7
1 parent 7d42ddf
commit 68336c7
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 34 deletions.
diff --git a/pkg/apis/zookeeper/v1beta1/zookeepercluster_types.go b/pkg/apis/zookeeper/v1beta1/zookeepercluster_types.go
@@ -68,7 +68,7 @@ type ZookeeperClusterSpec struct {
 	// PersistentVolumeClaimSpec is the spec to describe PVC for the container
 	// This field is optional. If no PVC spec, stateful containers will use
 	// emptyDir as volume.
-	PersistentVolumeClaimSpec v1.PersistentVolumeClaimSpec `json:"persistence,omitempty"`
+	PersistentVolumeClaimSpec *v1.PersistentVolumeClaimSpec `json:"persistence,omitempty"`
 
 	// Conf is the zookeeper configuration, which will be used to generate the
 	// static zookeeper configuration. If no configuration is provided required
@@ -121,15 +121,19 @@ func (s *ZookeeperClusterSpec) withDefaults(z *ZookeeperCluster) (changed bool)
 	if s.Pod.withDefaults(z) {
 		changed = true
 	}
-	s.PersistentVolumeClaimSpec.AccessModes = []v1.PersistentVolumeAccessMode{
-		v1.ReadWriteOnce,
-	}
-	if len(s.PersistentVolumeClaimSpec.Resources.Requests) == 0 {
-		s.PersistentVolumeClaimSpec.Resources.Requests = v1.ResourceList{
-			v1.ResourceStorage: resource.MustParse("20Gi"),
+
+	if s.PersistentVolumeClaimSpec != nil {
+		s.PersistentVolumeClaimSpec.AccessModes = []v1.PersistentVolumeAccessMode{
+			v1.ReadWriteOnce,
+		}
+		if len(s.PersistentVolumeClaimSpec.Resources.Requests) == 0 {
+			s.PersistentVolumeClaimSpec.Resources.Requests = v1.ResourceList{
+				v1.ResourceStorage: resource.MustParse("20Gi"),
+			}
+			changed = true
 		}
-		changed = true
 	}
+
 	return changed
 }
 

diff --git a/pkg/apis/zookeeper/v1beta1/zookeepercluster_types_test.go b/pkg/apis/zookeeper/v1beta1/zookeepercluster_types_test.go
@@ -36,6 +36,9 @@ var _ = Describe("ZookeeperCluster Types", func() {
 			ObjectMeta: metav1.ObjectMeta{
 				Name: "example",
 			},
+			Spec: v1beta1.ZookeeperClusterSpec{
+				PersistentVolumeClaimSpec: &corev1.PersistentVolumeClaimSpec{},
+			},
 		}
 	})
 
@@ -176,7 +179,7 @@ var _ = Describe("ZookeeperCluster Types", func() {
 		})
 
 		Context("PersistentVoluemClaim Spec", func() {
-			var p corev1.PersistentVolumeClaimSpec
+			var p *corev1.PersistentVolumeClaimSpec
 
 			BeforeEach(func() {
 				p = z.Spec.PersistentVolumeClaimSpec

diff --git a/pkg/apis/zookeeper/v1beta1/zz_generated.deepcopy.go b/pkg/apis/zookeeper/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/zk/generators.go b/pkg/zk/generators.go
@@ -32,8 +32,30 @@ func headlessSvcName(z *v1beta1.ZookeeperCluster) string {
 	return fmt.Sprintf("%s-headless", z.GetName())
 }
 
+var zkDataVolume = "data"
+
 // MakeStatefulSet return a zookeeper stateful set from the zk spec
 func MakeStatefulSet(z *v1beta1.ZookeeperCluster) *appsv1.StatefulSet {
+	extraVolumes := []v1.Volume{}
+	pvcSpec := z.Spec.PersistentVolumeClaimSpec
+	pvcs := []v1.PersistentVolumeClaim{}
+	if pvcSpec != nil {
+		pvcs = append(pvcs, v1.PersistentVolumeClaim{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:   zkDataVolume,
+				Labels: map[string]string{"app": z.GetName()},
+			},
+			Spec: *pvcSpec,
+		})
+	} else {
+		extraVolumes = append(extraVolumes, v1.Volume{
+			Name: zkDataVolume,
+			VolumeSource: v1.VolumeSource{
+				EmptyDir: &v1.EmptyDirVolumeSource{},
+			},
+		})
+	}
+
 	return &appsv1.StatefulSet{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "StatefulSet",
@@ -64,22 +86,14 @@ func MakeStatefulSet(z *v1beta1.ZookeeperCluster) *appsv1.StatefulSet {
 						"kind": "ZookeeperMember",
 					},
 				},
-				Spec: makeZkPodSpec(z),
-			},
-			VolumeClaimTemplates: []v1.PersistentVolumeClaim{
-				{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:   "data",
-						Labels: map[string]string{"app": z.GetName()},
-					},
-					Spec: z.Spec.PersistentVolumeClaimSpec,
-				},
+				Spec: makeZkPodSpec(z, extraVolumes),
 			},
+			VolumeClaimTemplates: pvcs,
 		},
 	}
 }
 
-func makeZkPodSpec(z *v1beta1.ZookeeperCluster) v1.PodSpec {
+func makeZkPodSpec(z *v1beta1.ZookeeperCluster, volumes []v1.Volume) v1.PodSpec {
 	zkContainer := v1.Container{
 		Name:            "zookeeper",
 		Image:           z.Spec.Image.ToString(),
@@ -115,22 +129,23 @@ func makeZkPodSpec(z *v1beta1.ZookeeperCluster) v1.PodSpec {
 	if z.Spec.Pod.Resources.Limits != nil || z.Spec.Pod.Resources.Requests != nil {
 		zkContainer.Resources = z.Spec.Pod.Resources
 	}
-	zkContainer.Env = z.Spec.Pod.Env
-	podSpec := v1.PodSpec{
-		Containers: []v1.Container{zkContainer},
-		Affinity:   z.Spec.Pod.Affinity,
-		Volumes: []v1.Volume{
-			{
-				Name: "conf",
-				VolumeSource: v1.VolumeSource{
-					ConfigMap: &v1.ConfigMapVolumeSource{
-						LocalObjectReference: v1.LocalObjectReference{
-							Name: z.ConfigMapName(),
-						},
-					},
+
+	volumes = append(volumes, v1.Volume{
+		Name: "conf",
+		VolumeSource: v1.VolumeSource{
+			ConfigMap: &v1.ConfigMapVolumeSource{
+				LocalObjectReference: v1.LocalObjectReference{
+					Name: z.ConfigMapName(),
 				},
 			},
 		},
+	})
+
+	zkContainer.Env = z.Spec.Pod.Env
+	podSpec := v1.PodSpec{
+		Containers:                    []v1.Container{zkContainer},
+		Affinity:                      z.Spec.Pod.Affinity,
+		Volumes:                       volumes,
 		TerminationGracePeriodSeconds: &z.Spec.Pod.TerminationGracePeriodSeconds,
 	}
 	if reflect.DeepEqual(v1.PodSecurityContext{}, z.Spec.Pod.SecurityContext) {