fix: do not create empty PVC when storage has only volumeMount (#1653)

When spec.storage contains only volumeMount entries (e.g. emptyDir)
without volumeClaimTemplate, the operator incorrectly set
PersistenceEnabled=true, causing an empty volumeClaimTemplates entry
in the StatefulSet. Check whether volumeClaimTemplate is actually
populated before enabling persistence.

Signed-off-by: Aleksandrov Aleksandr <aaleksandrov.cy@gmail.com>

Author: aa1ex

internal/k8sutils/redis-replication.go

@@ -194,7 +194,7 @@ func generateRedisReplicationContainerParams(cr *rrvb2.RedisReplication) contain
 	if cr.Spec.LivenessProbe != nil {
 		containerProp.LivenessProbe = cr.Spec.LivenessProbe
 	}
-	if cr.Spec.Storage != nil {
+	if storageHasVolumeClaimTemplate(cr.Spec.Storage) {
 		containerProp.PersistenceEnabled = &trueProperty
 	}
 	if cr.Spec.TLS != nil {
@@ -230,7 +230,7 @@ func generateRedisReplicationInitContainerParams(cr *rrvb2.RedisReplication) ini
 			initcontainerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume
 			initcontainerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath
 		}
-		if cr.Spec.Storage != nil {
+		if storageHasVolumeClaimTemplate(cr.Spec.Storage) {
 			initcontainerProp.PersistenceEnabled = &trueProperty
 		}
 	}

internal/k8sutils/redis-standalone.go

@@ -197,7 +197,7 @@ func generateRedisStandaloneContainerParams(cr *rvb2.Redis) containerParameters
 	if cr.Spec.LivenessProbe != nil {
 		containerProp.LivenessProbe = cr.Spec.LivenessProbe
 	}
-	if cr.Spec.Storage != nil {
+	if storageHasVolumeClaimTemplate(cr.Spec.Storage) {
 		containerProp.PersistenceEnabled = &trueProperty
 	}
 	if cr.Spec.TLS != nil {
@@ -233,7 +233,7 @@ func generateRedisStandaloneInitContainerParams(cr *rvb2.Redis) initContainerPar
 			initcontainerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume
 			initcontainerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath
 		}
-		if cr.Spec.Storage != nil {
+		if storageHasVolumeClaimTemplate(cr.Spec.Storage) {
 			initcontainerProp.PersistenceEnabled = &trueProperty
 		}
 	}

internal/k8sutils/statefulset.go

@@ -250,6 +250,17 @@ func syncManagedFields(stored, new *appsv1.StatefulSet) {
 	new.ManagedFields = stored.ManagedFields
 }
 
+// storageHasVolumeClaimTemplate checks if the Storage has a meaningful VolumeClaimTemplate defined
+// (i.e., not just the zero value). This distinguishes between storage configured with only
+// volumeMount (e.g. emptyDir) vs. storage that actually requests a PersistentVolumeClaim.
+func storageHasVolumeClaimTemplate(storage *commonapi.Storage) bool {
+	if storage == nil {
+		return false
+	}
+	vct := storage.VolumeClaimTemplate
+	return len(vct.Spec.AccessModes) > 0 || vct.Spec.Resources.Requests != nil || vct.Spec.StorageClassName != nil || vct.Spec.VolumeName != ""
+}
+
 // hasVolumeClaimTemplates checks if the StatefulSet has VolumeClaimTemplates and if their counts match.
 func hasVolumeClaimTemplates(new, stored *appsv1.StatefulSet) bool {
 	return len(new.Spec.VolumeClaimTemplates) >= 1 && len(new.Spec.VolumeClaimTemplates) == len(stored.Spec.VolumeClaimTemplates)

internal/k8sutils/statefulset_test.go

@@ -48,6 +48,62 @@ func TestGenerateAuthAndTLSArgs(t *testing.T) {
 	}
 }
 
+func TestStorageHasVolumeClaimTemplate(t *testing.T) {
+	tests := []struct {
+		name    string
+		storage *common.Storage
+		want    bool
+	}{
+		{"nil storage", nil, false},
+		{"empty VolumeClaimTemplate", &common.Storage{}, false},
+		{"only volumeMount", &common.Storage{
+			VolumeMount: common.AdditionalVolume{
+				Volume:    []corev1.Volume{{Name: "data", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}}},
+				MountPath: []corev1.VolumeMount{{Name: "data", MountPath: "/data"}},
+			},
+		}, false},
+		{"with AccessModes", &common.Storage{
+			VolumeClaimTemplate: corev1.PersistentVolumeClaim{
+				Spec: corev1.PersistentVolumeClaimSpec{
+					AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+				},
+			},
+		}, true},
+		{"with Resources.Requests", &common.Storage{
+			VolumeClaimTemplate: corev1.PersistentVolumeClaim{
+				Spec: corev1.PersistentVolumeClaimSpec{
+					Resources: corev1.VolumeResourceRequirements{
+						Requests: corev1.ResourceList{
+							corev1.ResourceStorage: resource.MustParse("1Gi"),
+						},
+					},
+				},
+			},
+		}, true},
+		{"with StorageClassName", &common.Storage{
+			VolumeClaimTemplate: corev1.PersistentVolumeClaim{
+				Spec: corev1.PersistentVolumeClaimSpec{
+					StorageClassName: ptr.To("standard"),
+				},
+			},
+		}, true},
+		{"with VolumeName", &common.Storage{
+			VolumeClaimTemplate: corev1.PersistentVolumeClaim{
+				Spec: corev1.PersistentVolumeClaimSpec{
+					VolumeName: "pv-data",
+				},
+			},
+		}, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := storageHasVolumeClaimTemplate(tt.storage)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
 func TestGeneratePreStopCommand(t *testing.T) {
 	tests := []struct {
 		name        string