Remove PrimaryHost attribute from pgcluster CRD

This is no longer used.

Author: Jonathan S. Katz

examples/create-by-resource/fromcrd.json

@@ -81,7 +81,6 @@
     },
     "policies": "",
     "port": "5432",
-    "primaryhost": "fromcrd",
     "primarysecretname": "fromcrd-primaryuser-secret",
     "replicas": "0",
     "rootsecretname": "fromcrd-postgres-secret",

internal/apiserver/clusterservice/clusterimpl.go

@@ -1311,7 +1311,6 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	spec.PGBadgerPort = apiserver.Pgo.Cluster.PGBadgerPort
 	spec.ExporterPort = apiserver.Pgo.Cluster.ExporterPort
 	spec.SecretFrom = ""
-	spec.PrimaryHost = name
 	if request.Policies == "" {
 		spec.Policies = apiserver.Pgo.Cluster.Policies
 		log.Debugf("Pgo.Cluster.Policies %s", apiserver.Pgo.Cluster.Policies)

internal/operator/backrest/restore.go

@@ -342,7 +342,6 @@ func createRestoredDeployment(restclient *rest.RESTClient, cluster *crv1.Pgclust
 		IsInit:            true,
 		Replicas:          "1",
 		ClusterName:       cluster.Spec.Name,
-		PrimaryHost:       restoreToName,
 		Port:              cluster.Spec.Port,
 		CCPImagePrefix:    util.GetValueOrDefault(cluster.Spec.CCPImagePrefix, operator.Pgo.Cluster.CCPImagePrefix),
 		CCPImage:          cluster.Spec.CCPImage,

internal/operator/cluster/clone.go

@@ -801,7 +801,6 @@ func createCluster(clientset kubernetes.Interface, client *rest.RESTClient, task
 			PodAntiAffinity:   sourcePgcluster.Spec.PodAntiAffinity,
 			Policies:          sourcePgcluster.Spec.Policies,
 			Port:              sourcePgcluster.Spec.Port,
-			PrimaryHost:       sourcePgcluster.Spec.PrimaryHost,
 			PrimaryStorage:    sourcePgcluster.Spec.PrimaryStorage,
 			PrimarySecretName: fmt.Sprintf("%s%s", targetClusterName, crv1.PrimarySecretSuffix),
 			// Replicas is set to "0" because we want to ensure that no replicas are

internal/operator/cluster/clusterlogic.go

@@ -299,7 +299,6 @@ func getClusterDeploymentFields(clientset kubernetes.Interface, client *rest.RES
 		IsInit:             true,
 		Replicas:           "0",
 		ClusterName:        cl.Spec.Name,
-		PrimaryHost:        cl.Annotations[config.ANNOTATION_CURRENT_PRIMARY],
 		Port:               cl.Spec.Port,
 		CCPImagePrefix:     util.GetValueOrDefault(cl.Spec.CCPImagePrefix, operator.Pgo.Cluster.CCPImagePrefix),
 		CCPImage:           cl.Spec.CCPImage,
@@ -456,7 +455,6 @@ func scaleReplicaCreateDeployment(clientset kubernetes.Interface, client *rest.R
 		CCPImageTag:        imageTag,
 		CCPImage:           image,
 		PVCName:            dataVolume.InlineVolumeSource(),
-		PrimaryHost:        cluster.Spec.PrimaryHost,
 		Database:           cluster.Spec.Database,
 		DataPathOverride:   replica.Spec.Name,
 		ArchiveMode:        archiveMode,

internal/operator/clusterutilities.go

@@ -138,35 +138,33 @@ type BootstrapJobTemplateFields struct {
 
 // DeploymentTemplateFields ...
 type DeploymentTemplateFields struct {
-	Name                string
-	ClusterName         string
-	Port                string
-	CCPImagePrefix      string
-	CCPImageTag         string
-	CCPImage            string
-	Database            string
-	DeploymentLabels    string
-	PodLabels           string
-	DataPathOverride    string
-	ArchiveMode         string
-	PVCName             string
-	RootSecretName      string
-	UserSecretName      string
-	PrimarySecretName   string
-	SecurityContext     string
-	ContainerResources  string
-	NodeSelector        string
-	ConfVolume          string
-	CollectAddon        string
-	CollectVolume       string
-	BadgerAddon         string
-	PgbackrestEnvVars   string
-	PgbackrestS3EnvVars string
-	PgmonitorEnvVars    string
-	ScopeLabel          string
-	//next 2 are for the replica deployment only
+	Name                     string
+	ClusterName              string
+	Port                     string
+	CCPImagePrefix           string
+	CCPImageTag              string
+	CCPImage                 string
+	Database                 string
+	DeploymentLabels         string
+	PodLabels                string
+	DataPathOverride         string
+	ArchiveMode              string
+	PVCName                  string
+	RootSecretName           string
+	UserSecretName           string
+	PrimarySecretName        string
+	SecurityContext          string
+	ContainerResources       string
+	NodeSelector             string
+	ConfVolume               string
+	CollectAddon             string
+	CollectVolume            string
+	BadgerAddon              string
+	PgbackrestEnvVars        string
+	PgbackrestS3EnvVars      string
+	PgmonitorEnvVars         string
+	ScopeLabel               string
 	Replicas                 string
-	PrimaryHost              string
 	IsInit                   bool
 	EnableCrunchyadm         bool
 	ReplicaReinitOnStartFail bool

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

@@ -94,7 +94,6 @@ type PgclusterSpec struct {
 	// PgBouncer contains all of the settings to properly maintain a pgBouncer
 	// implementation
 	PgBouncer           PgBouncerSpec            `json:"pgBouncer"`
-	PrimaryHost         string                   `json:"primaryhost"`
 	User                string                   `json:"user"`
 	Database            string                   `json:"database"`
 	Replicas            string                   `json:"replicas"`