Skip to content

Fix label on rmdata for pgpool that excludes pgpool deployments #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 17, 2019
Merged

Fix label on rmdata for pgpool that excludes pgpool deployments #827

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
94e3b6e
Alter config.toml, remove some unnecessary files (#556)
xenophenes Jan 24, 2019
6279f18
Update README (#573)
xenophenes Jan 31, 2019
5dfd4e9
add regexp to check usernames passed into create user command to prev…
Feb 22, 2019
b5a2ad8
fix merge conflicts
Feb 25, 2019
55e6be1
updating README links for documentation
cahoonpwork Feb 25, 2019
4acdb93
fix example/envs.sh: use CO_NAMESPACE (#613)
Sayrus Mar 4, 2019
e7ca007
create stale.yml
cahoonpwork Mar 4, 2019
7e867eb
fix merge conflict
Mar 25, 2019
e543ef2
Fix merge issue
Jun 5, 2019
32133ea
merge upstream....again...
Jun 5, 2019
a2c7faf
Merge remote-tracking branch 'upstream/develop' into develop
Jun 6, 2019
584763b
Merge remote-tracking branch 'upstream/develop' into develop
Jun 11, 2019
24e7f54
Merge remote-tracking branch 'upstream/develop' into develop
Jun 11, 2019
278760d
Merge remote-tracking branch 'upstream/develop' into develop
Jun 17, 2019
fa50929
Fix label used during delete of pgpool resources
Jun 17, 2019
5105ee6
Fix previous merge issue with file
Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apiserver/clusterservice/clusterimpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down