fix(controller): Ensure sane defaults are set (#181)

* fix(controller): Ensure sane defaults are set Ensure we set sane defaults even if the user specifies part of an PVC object * pacify the linter
hyperspike · Jan 30, 2025 · 248c392 · 248c392
1 parent 296041c
commit 248c392
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/internal/controller/valkey_controller.go b/internal/controller/valkey_controller.go
@@ -58,10 +58,11 @@ import (
 )
 
 const (
-	Metrics      = "metrics"
-	LoadBalancer = "LoadBalancer"
-	ValkeyProxy  = "valkey-proxy"
-	Valkey       = "valkey"
+	DefaultVolumeSize = "8Gi"
+	Metrics           = "metrics"
+	LoadBalancer      = "LoadBalancer"
+	ValkeyProxy       = "valkey-proxy"
+	Valkey            = "valkey"
 )
 
 func init() {
@@ -1939,7 +1940,7 @@ func generatePVC(valkey *hyperv1.Valkey) corev1.PersistentVolumeClaim {
 			},
 			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
-					"storage": func(s string) resource.Quantity { return resource.MustParse(s) }("8Gi"),
+					"storage": func(s string) resource.Quantity { return resource.MustParse(s) }(DefaultVolumeSize),
 				},
 			},
 		},
@@ -1954,6 +1955,15 @@ func generatePVC(valkey *hyperv1.Valkey) corev1.PersistentVolumeClaim {
 				pv.ObjectMeta.Labels[k] = v
 			}
 		}
+		if len(pv.Spec.AccessModes) == 0 {
+			pv.Spec.AccessModes = []corev1.PersistentVolumeAccessMode{
+				"ReadWriteOnce",
+			}
+		}
+		_, ok := pv.Spec.Resources.Requests["storage"]
+		if !ok {
+			pv.Spec.Resources.Requests["storage"] = func(s string) resource.Quantity { return resource.MustParse(s) }(DefaultVolumeSize)
+		}
 	}
 	return pv
 }