Fix label on rmdata for pgpool that excludes pgpool deployments (CrunchyData#827)

flamingdumpster · Jeff McCormick · commit 46aea5115621 · 2019-06-17T14:49:38.000-05:00
* Alter config.toml, remove some unnecessary files (CrunchyData#556) * Update README (CrunchyData#573) * add regexp to check usernames passed into create user command to prevent special chars from being passed in * updating README links for documentation * fix example/envs.sh: use CO_NAMESPACE (CrunchyData#613) Signed-off-by: Mathis Raguin <mathis.raguin@epita.fr> * create stale.yml * Fix label used during delete of pgpool resources * Fix previous merge issue with file
diff --git a/apiserver/clusterservice/clusterimpl.go b/apiserver/clusterservice/clusterimpl.go
@@ -990,7 +990,7 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 	var err error
 
 	//dont include pgpool or pgbouncer deployments
-	selector := config.LABEL_PG_CLUSTER + "=" + clusterName + "," + config.LABEL_PGBACKUP + "!=true," + config.LABEL_PGPOOL + "!=true," + config.LABEL_PGBOUNCER + "!=true"
+	selector := config.LABEL_PG_CLUSTER + "=" + clusterName + "," + config.LABEL_PGBACKUP + "!=true," + config.LABEL_PGPOOL_POD + "!=true," + config.LABEL_PGBOUNCER + "!=true"
 	log.Debugf("selector for delete is %s", selector)
 	deployments, err := kubeapi.GetDeployments(apiserver.Clientset, selector, ns)
 	if err != nil {
