Skip to content

Secret label #784

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
jmccormick2001 merged 2 commits into from
May 30, 2019
Merged

Secret label #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5bb4d0
change getsecrets selector to exclude pgo-backrest-repo secrets
May 30, 2019
e3204f3
add exclusion to pgo show user secret selector to prevent backrest re…
May 30, 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/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var backrestStorageTypes = []string{"local", "s3"}
func GetSecrets(cluster *crv1.Pgcluster, ns string) ([]msgs.ShowUserSecret, error) {

output := make([]msgs.ShowUserSecret, 0)
selector := config.LABEL_PGBOUNCER + "!=true," + config.LABEL_PGPOOL + "!=true," + config.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
selector := "!" + config.LABEL_PGO_BACKREST_REPO + "," + config.LABEL_PGBOUNCER + "!=true," + config.LABEL_PGPOOL + "!=true," + config.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name

secrets, err := kubeapi.GetSecrets(Clientset, selector, ns)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion apiserver/userservice/userimpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ func getPostgresUserInfo(namespace, clusterName string) (connInfo, error) {
}

//get the secrets for this cluster
selector := config.LABEL_PG_CLUSTER + "=" + clusterName
selector := "!" + config.LABEL_PGO_BACKREST_REPO + "," + config.LABEL_PG_CLUSTER + "=" + clusterName
secrets, err := kubeapi.GetSecrets(apiserver.Clientset, selector, namespace)
if err != nil {
return info, err
Expand Down