Merge "Make logjuicer-data persistent by using a PersistentVolumeClaim"

Author: Microzuul CI

controllers/libs/base/base.go

@@ -164,6 +164,18 @@ func MkEmptyDirVolume(name string) apiv1.Volume {
 	}
 }
 
+// MkVolumePVC produces a Volume backed by a PersistentVolumeClaim
+func MkVolumePVC(name string, claimName string) apiv1.Volume {
+	return apiv1.Volume{
+		Name: name,
+		VolumeSource: apiv1.VolumeSource{
+			PersistentVolumeClaim: &apiv1.PersistentVolumeClaimVolumeSource{
+				ClaimName: claimName,
+			},
+		},
+	}
+}
+
 // MkSecretEnvVar produces an EnvVar from a Secret's key.
 // When the 'key' parameter is empty the key name is the Secret name
 func MkSecretEnvVar(env string, secret string, key string) apiv1.EnvVar {

controllers/logjuicer.go

@@ -31,22 +31,33 @@ func (r *SFController) AddCorporateCA(spec *apiv1.PodSpec) string {
 
 func (r *SFController) EnsureLogJuicer() bool {
 	const (
-		ident = "logjuicer"
-		port  = 3000
+		ident         = "logjuicer"
+		port          = 3000
+		pvcName       = "logjuicer-pvc"
+		logJuicerData = "logjuicer-data"
 	)
 
+	// Ensure PVC exists
+	pvc := base.MkPVC(pvcName, r.ns, base.StorageConfig{
+		Size: utils.Qty1Gi(),
+	}, apiv1.ReadWriteOnce)
+	r.GetOrCreate(&pvc)
+
+	// Create Service
 	srv := base.MkService(ident, r.ns, ident, []int32{port}, ident, r.cr.Spec.ExtraLabels)
 	r.GetOrCreate(&srv)
 
+	// Create Deployment
 	dep := base.MkDeployment(ident, r.ns, base.LogJuicerImage(), r.cr.Spec.ExtraLabels, r.isOpenShift)
 	dep.Spec.Template.Spec.Containers[0].ImagePullPolicy = "Always"
+
+	// Use PVC for logjuicer-data volume
 	dep.Spec.Template.Spec.Volumes = []apiv1.Volume{
-		// TODO: make this persistent
-		base.MkEmptyDirVolume("logjuicer-data"),
+		base.MkVolumePVC(logJuicerData, pvcName),
 	}
 	dep.Spec.Template.Spec.Containers[0].VolumeMounts = []apiv1.VolumeMount{
 		{
-			Name:      "logjuicer-data",
+			Name:      logJuicerData,
 			MountPath: "/data",
 		},
 	}
@@ -63,6 +74,7 @@ func (r *SFController) EnsureLogJuicer() bool {
 	}
 	dep.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
 
+	// Reconcile deployment
 	current := appsv1.Deployment{}
 	if r.GetM(ident, &current) {
 		if utils.MapEquals(&current.Spec.Template.ObjectMeta.Annotations, &dep.Spec.Template.ObjectMeta.Annotations) {

doc/reference/CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - logjuicer service is based on a ubi9 base image
+- logjuicer service uses a persistent volume claim for data storage
 - zookeeper: bumped to 3.9.3
 - httpd-24: bumped to registry.access.redhat.com/ubi8/httpd-24:1-350
 - weeder: update ubi9-python-39 container