fix pgbouncer svc deletion when pgo delete cluster is called

Author: jmccormick2001

operator/cluster/cluster_strategy_1.go

@@ -194,14 +194,19 @@ func (r Strategy1) DeleteCluster(clientset *kubernetes.Clientset, restclient *re
 		log.Error("error deleting primary Deployment " + err.Error())
 	}
 
+	//delete the pgbouncer service if exists
+	if cl.Spec.UserLabels[util.LABEL_PGBOUNCER] == "true" {
+		DeletePgbouncer(clientset, cl.Spec.Name, namespace)
+	}
+
 	//delete the primary service
 	kubeapi.DeleteService(clientset, cl.Spec.Name, namespace)
 
 	//delete the replica service
 	kubeapi.DeleteService(clientset, cl.Spec.Name+ReplicaSuffix, namespace)
 
 	//delete the pgpool deployment if necessary
-	if cl.Spec.UserLabels["crunchy-pgpool"] == "true" {
+	if cl.Spec.UserLabels[util.LABEL_PGPOOL] == "true" {
 		DeletePgpool(clientset, cl.Spec.Name, namespace)
 	}
 

pgo/cmd/create.go

@@ -226,6 +226,7 @@ func init() {
 	createClusterCmd.Flags().BoolVarP(&BackrestFlag, "pgbackrest", "", false, "Enables a pgBackRest volume for the database pod.")
 	createClusterCmd.Flags().BoolVarP(&BadgerFlag, "pgbadger", "", false, "Adds the crunchy-pgbadger container to the database pod.")
 	createClusterCmd.Flags().BoolVarP(&PgpoolFlag, "pgpool", "", false, "Adds the crunchy-pgpool container to the database pod.")
+	createClusterCmd.Flags().BoolVarP(&PgbouncerFlag, "pgbouncer", "", false, "Adds a crunchy-pgbouncer deployment to the cluster.")
 	createClusterCmd.Flags().BoolVarP(&ArchiveFlag, "archive", "", false, "Enables archive logging for the database cluster.")
 	createClusterCmd.Flags().StringVarP(&PgpoolSecret, "pgpool-secret", "", "", "The name of a pgpool secret to use for the pgpool configuration.")
 	createClusterCmd.Flags().BoolVarP(&MetricsFlag, "metrics", "", false, "Adds the crunchy-collect container to the database pod.")