Remove SecretFrom from the pgcluster Spec

This is only used as part of one of the API operations. Future
work can explore doing something closer to the intended action,
e.g. creating a new PostgreSQL cluster from an old one from a
custom resource workflow.

Author: Jonathan S. Katz

internal/apiserver/clusterservice/clusterimpl.go

@@ -1310,7 +1310,6 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	spec.Port = apiserver.Pgo.Cluster.Port
 	spec.PGBadgerPort = apiserver.Pgo.Cluster.PGBadgerPort
 	spec.ExporterPort = apiserver.Pgo.Cluster.ExporterPort
-	spec.SecretFrom = ""
 	if request.Policies == "" {
 		spec.Policies = apiserver.Pgo.Cluster.Policies
 		log.Debugf("Pgo.Cluster.Policies %s", apiserver.Pgo.Cluster.Policies)
@@ -1371,11 +1370,6 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	spec.TLS.TLSSecret = request.TLSSecret
 	spec.TLS.ReplicationTLSSecret = request.ReplicationTLSSecret
 
-	//pass along command line flags for a restore
-	if request.SecretFrom != "" {
-		spec.SecretFrom = request.SecretFrom
-	}
-
 	spec.CustomConfig = request.CustomConfig
 	spec.SyncReplication = request.SyncReplication
 

internal/operator/cluster/clone.go

@@ -805,14 +805,10 @@ func createCluster(clientset kubernetes.Interface, client *rest.RESTClient, task
 			PrimarySecretName: fmt.Sprintf("%s%s", targetClusterName, crv1.PrimarySecretSuffix),
 			// Replicas is set to "0" because we want to ensure that no replicas are
 			// provisioned with the clone
-			Replicas:       "0",
-			ReplicaStorage: sourcePgcluster.Spec.ReplicaStorage,
-			Resources:      sourcePgcluster.Spec.Resources,
-			RootSecretName: fmt.Sprintf("%s%s", targetClusterName, crv1.RootSecretSuffix),
-			// SecretFrom needs to be set as the "sourcePgcluster.Spec.ClusterName"
-			// as this will indicate we got our secrets from the original cluster
-			// ...this does NOT copy over the secrets as I thought it would.
-			SecretFrom:      sourcePgcluster.Spec.ClusterName,
+			Replicas:        "0",
+			ReplicaStorage:  sourcePgcluster.Spec.ReplicaStorage,
+			Resources:       sourcePgcluster.Spec.Resources,
+			RootSecretName:  fmt.Sprintf("%s%s", targetClusterName, crv1.RootSecretSuffix),
 			SyncReplication: sourcePgcluster.Spec.SyncReplication,
 			User:            sourcePgcluster.Spec.User,
 			UserSecretName:  fmt.Sprintf("%s-%s%s", targetClusterName, sourcePgcluster.Spec.User, crv1.UserSecretSuffix),

pkg/apis/crunchydata.com/v1/cluster.go

@@ -97,7 +97,6 @@ type PgclusterSpec struct {
 	User                string                   `json:"user"`
 	Database            string                   `json:"database"`
 	Replicas            string                   `json:"replicas"`
-	SecretFrom          string                   `json:"secretfrom"`
 	UserSecretName      string                   `json:"usersecretname"`
 	RootSecretName      string                   `json:"rootsecretname"`
 	PrimarySecretName   string                   `json:"primarysecretname"`