Merge pull request #298 from fmount/must_parse

Do not use MustParse to process PVC size

Author: openshift-merge-bot[bot]

controllers/designatebackendbind9_controller.go

@@ -600,7 +600,10 @@ func (r *DesignateBackendbind9Reconciler) reconcileNormal(ctx context.Context, i
 	//
 
 	// Define a new StatefulSet object
-	deplDef := designatebackendbind9.StatefulSet(instance, inputHash, serviceLabels, serviceAnnotations, topology)
+	deplDef, err := designatebackendbind9.StatefulSet(instance, inputHash, serviceLabels, serviceAnnotations, topology)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
 	depl := statefulset.NewStatefulSet(
 		deplDef,
 		time.Duration(5)*time.Second,

pkg/designatebackendbind9/deployment.go

@@ -48,7 +48,7 @@ func StatefulSet(
 	labels map[string]string,
 	annotations map[string]string,
 	topology *topologyv1.Topology,
-) *appsv1.StatefulSet {
+) (*appsv1.StatefulSet, error) {
 
 	// TODO(beagles): Dbl check that running as the default kolla/tcib user works okay here. Permissions on some of the
 	// directories require serious care.
@@ -76,6 +76,12 @@ func StatefulSet(
 		Port: intstr.IntOrString{Type: intstr.Int, IntVal: int32(953)},
 	}
 
+	// Parse the storageRequest defined in the CR
+	storageRequest, err := resource.ParseQuantity(instance.Spec.StorageRequest)
+	if err != nil {
+		return nil, err
+	}
+
 	envVars := map[string]env.Setter{}
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
 	envVars["CONFIG_HASH"] = env.SetValue(configHash)
@@ -141,7 +147,7 @@ func StatefulSet(
 				StorageClassName: &instance.Spec.StorageClass,
 				Resources: corev1.VolumeResourceRequirements{
 					Requests: corev1.ResourceList{
-						corev1.ResourceStorage: resource.MustParse(instance.Spec.StorageRequest),
+						corev1.ResourceStorage: storageRequest,
 					},
 				},
 			},
@@ -201,5 +207,5 @@ func StatefulSet(
 		designate.PredictableIPContainer(predIPContainerDetails),
 	}
 
-	return statefulSet
+	return statefulSet, nil
 }