updates from PR feedback

Author: tjmoore4

internal/controller/postgrescluster/pgbackrest.go

@@ -2775,8 +2775,7 @@ func (r *Reconciler) reconcileRepos(ctx context.Context,
 	repoVols := []*corev1.PersistentVolumeClaim{}
 	var replicaCreateRepo v1beta1.PGBackRestRepo
 
-	autogrow := feature.Enabled(ctx, feature.AutoGrowVolumes)
-	if autogrow {
+	if feature.Enabled(ctx, feature.AutoGrowVolumes) {
 		// get the autogrow annotations so that the correct volume size values can be
 		// used and the cluster status can be updated
 		errors = append(errors, r.getRepoHostVolumeRequests(ctx, postgresCluster))
@@ -2829,34 +2828,37 @@ func (r *Reconciler) getRepoHostVolumeRequests(ctx context.Context,
 	cluster *v1beta1.PostgresCluster) error {
 
 	pods := &corev1.PodList{}
-	err := errors.WithStack(
+	if err := errors.WithStack(
 		r.Client.List(ctx, pods,
 			client.InNamespace(cluster.Namespace),
 			client.MatchingLabelsSelector{
 				Selector: naming.PGBackRestDedicatedLabels(cluster.Name).AsSelector()},
-		))
-
-	if len(pods.Items) == 1 {
-		// there should only ever be one repo host Pod
-		repoHost := pods.Items[0]
-
-		if cluster.Status.PGBackRest != nil {
-			var backupRequest string
-			for i := range cluster.Status.PGBackRest.Repos {
-				if repoHost.Annotations["suggested-"+cluster.Status.PGBackRest.Repos[i].Name+"-pvc-size"] != "" {
-					// get the backup request from the status, if it is set
-					backupRequest = cluster.Status.PGBackRest.Repos[i].DesiredRepoVolume
-
-					value := r.storeDesiredRequest(ctx, cluster, cluster.Status.PGBackRest.Repos[i].Name, "repo-host",
-						repoHost.Annotations["suggested-"+cluster.Status.PGBackRest.Repos[i].Name+"-pvc-size"], backupRequest)
-					if err == nil {
-						cluster.Status.PGBackRest.Repos[i].DesiredRepoVolume = value
-					}
-				}
+		)); err != nil {
+		return err
+	}
+
+	// there should only ever be one repo host Pod
+	if len(pods.Items) != 1 {
+		return errors.Errorf("Found %d pgBackRest repo host Pods. Expected 1.", len(pods.Items))
+	}
+	repoHost := pods.Items[0]
+
+	if cluster.Status.PGBackRest != nil {
+		var backupRequest string
+		for i := range cluster.Status.PGBackRest.Repos {
+			if repoHost.Annotations["suggested-"+cluster.Status.PGBackRest.Repos[i].Name+"-pvc-size"] != "" {
+				// get the backup request from the status, if it is set
+				backupRequest = cluster.Status.PGBackRest.Repos[i].DesiredRepoVolume
+
+				value := r.storeDesiredRequest(ctx, cluster, cluster.Status.PGBackRest.Repos[i].Name, "repo-host",
+					repoHost.Annotations["suggested-"+cluster.Status.PGBackRest.Repos[i].Name+"-pvc-size"], backupRequest)
+
+				cluster.Status.PGBackRest.Repos[i].DesiredRepoVolume = value
 			}
 		}
 	}
-	return err
+
+	return nil
 }
 
 // +kubebuilder:rbac:groups="",resources="pods",verbs={get,list}

internal/controller/postgrescluster/pgbackrest_test.go

@@ -4515,7 +4515,13 @@ func TestGetRepoHostVolumeRequests(t *testing.T) {
 			}
 
 			err := reconciler.getRepoHostVolumeRequests(ctx, cluster)
-			assert.NilError(t, err)
+
+			if tc.repoHostExists {
+				assert.NilError(t, err)
+			} else {
+				assert.ErrorContains(t, err, "Found 0 pgBackRest repo host Pods. Expected 1.")
+			}
+
 			assert.Assert(t, cluster.Status.PGBackRest != nil)
 
 			var i int

internal/pgbackrest/config.go

@@ -627,9 +627,11 @@ func reloadCommand(name string) []string {
 	// the '1M-blocks' output (second column) and the 'use' variable gets the value
 	// from the 'Use%' column (fifth column). This value is grabbed after stripping
 	// out the column headers (before the '\n') and then getting the respective
-	// value delimited by the white spaces. The percent value is stripped of the
-	// '%' and then used to determine if a expansion should be triggered by setting
-	// the calculated volume size using the 'size' variable.
+	// value delimited by the white spaces by using the 'read -r' command.
+	// The underscores (_) discard fields and the variables store them. This allows
+	// for selective parsing of the provided lines. The percent value is stripped of
+	// the '%' and then used to determine if a expansion should be triggered by
+	// setting the calculated volume size using the 'size' variable.
 	const script = `
 # Parameters for curl when managing autogrow annotation.
 APISERVER="https://kubernetes.default.svc"