Secret label (CrunchyData#784)

Jeff McCormick · web-flow · commit b04c48af8e36 · 2019-05-30T07:39:38.000-05:00
* change getsecrets selector to exclude pgo-backrest-repo secrets

* add exclusion to pgo show user secret selector to prevent backrest repo secret from showing
diff --git a/apiserver/userservice/userimpl.go b/apiserver/userservice/userimpl.go
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ func getPostgresUserInfo(namespace, clusterName string) (connInfo, error) {`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`//get the secrets for this cluster`
`381`		`- selector := config.LABEL_PG_CLUSTER + "=" + clusterName`
	`381`	`+ selector := "!" + config.LABEL_PGO_BACKREST_REPO + "," + config.LABEL_PG_CLUSTER + "=" + clusterName`
`382`	`382`	`secrets, err := kubeapi.GetSecrets(apiserver.Clientset, selector, namespace)`
`383`	`383`	`if err != nil {`
`384`	`384`	`return info, err`