Fix S3-Only Cluster Cloning (4.2 backpatch)

All S3 environment variables are now properly set on both the
pgBackRest repo Pod and the pgBackRest restore Job when cloning
a pgcluster.  This ensure the restore is able to complete
successfully during the second step of the clone workflow when
cloning a cluster that utilizes S3 only with pgBackRest.

Author: andrewlecuyer

controller/jobcontroller.go

@@ -448,15 +448,25 @@ func (c *JobController) onUpdate(oldObj, newObj interface{}) {
 			// next, update the workflow to indicate that step 1 is complete
 			clusteroperator.UpdateCloneWorkflow(c.JobClient, namespace, workflowID, crv1.PgtaskWorkflowCloneRestoreBackup)
 
+			// determine the storage source (e.g. local or s3) to use for the restore based on the storage
+			// source utilized for the backrest repo sync job
+			var storageSource string
+			for _, envVar := range job.Spec.Template.Spec.Containers[0].Env {
+				if envVar.Name == "BACKREST_STORAGE_SOURCE" {
+					storageSource = envVar.Value
+				}
+			}
+
 			// now, set up a new pgtask that will allow us to perform the restore
 			cloneTask := util.CloneTask{
-				PGOUser:           job.ObjectMeta.Labels[config.LABEL_PGOUSER],
-				SourceClusterName: sourceClusterName,
-				TargetClusterName: targetClusterName,
-				TaskStepLabel:     config.LABEL_PGO_CLONE_STEP_2,
-				TaskType:          crv1.PgtaskCloneStep2,
-				Timestamp:         time.Now(),
-				WorkflowID:        workflowID,
+				BackrestStorageSource: storageSource,
+				PGOUser:               job.ObjectMeta.Labels[config.LABEL_PGOUSER],
+				SourceClusterName:     sourceClusterName,
+				TargetClusterName:     targetClusterName,
+				TaskStepLabel:         config.LABEL_PGO_CLONE_STEP_2,
+				TaskType:              crv1.PgtaskCloneStep2,
+				Timestamp:             time.Now(),
+				WorkflowID:            workflowID,
 			}
 
 			task := cloneTask.Create()

operator/cluster/clone.go

@@ -324,8 +324,11 @@ func cloneStep2(clientset *kubernetes.Clientset, client *rest.RESTClient, namesp
 			},
 		},
 		Spec: crv1.PgclusterSpec{
-			Port:           sourcePgcluster.Spec.Port,
-			PrimaryStorage: sourcePgcluster.Spec.PrimaryStorage,
+			BackrestS3Bucket:   sourcePgcluster.Spec.BackrestS3Bucket,
+			BackrestS3Endpoint: sourcePgcluster.Spec.BackrestS3Endpoint,
+			BackrestS3Region:   sourcePgcluster.Spec.BackrestS3Region,
+			Port:               sourcePgcluster.Spec.Port,
+			PrimaryStorage:     sourcePgcluster.Spec.PrimaryStorage,
 			UserLabels: map[string]string{
 				config.LABEL_BACKREST_STORAGE_TYPE: sourcePgcluster.Spec.UserLabels[config.LABEL_BACKREST_STORAGE_TYPE],
 			},