Skip to content

Commit 649646a

Browse files
author
jmccormick2001
committed
fix pgo label command to support short version of selector flag on command line
1 parent d03b194 commit 649646a

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

apiserver/labelservice/labelimpl.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,22 @@ func Label(request *msgs.LabelRequest) msgs.LabelResponse {
5858
}
5959

6060
clusterList := crv1.PgclusterList{}
61-
if request.Selector == "" || request.Args[0] == "all" {
61+
if len(request.Args) > 0 && request.Args[0] == "all" {
62+
err = kubeapi.GetpgclustersBySelector(apiserver.RESTClient,
63+
&clusterList, "", apiserver.Namespace)
64+
if err != nil {
65+
log.Error("error getting list of clusters" + err.Error())
66+
resp.Status.Code = msgs.Error
67+
resp.Status.Msg = "error getting list of clusters" + err.Error()
68+
return resp
69+
}
70+
if len(clusterList.Items) == 0 {
71+
resp.Status.Code = msgs.Error
72+
resp.Status.Msg = "no clusters found"
73+
return resp
74+
}
75+
76+
} else if request.Selector != "" {
6277
err = kubeapi.GetpgclustersBySelector(apiserver.RESTClient,
6378
&clusterList, request.Selector, apiserver.Namespace)
6479
if err != nil {

pgo/cmd/label.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ func labelClusters(clusters []string) {
7878
r.DeleteLabel = DeleteLabel
7979
r.ClientVersion = msgs.PGO_VERSION
8080

81+
log.Debugf("%s is the selector", r.Selector)
8182
response, err := api.LabelClusters(httpclient, &SessionCredentials, r)
8283
if err != nil {
8384
fmt.Println("Error: " + err.Error())

0 commit comments

Comments
 (0)