Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 0338f02

Browse files
author
harry
authored
Merge pull request #122 from YaoZengzeng/grpc-list-services
grpc for ListServices
2 parents 0eb13a2 + 5eba121 commit 0338f02

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

pkg/kubelet/hyper/hyperclient.go

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -767,10 +767,12 @@ func (client *HyperClient) IsImagePresent(repo, tag string) (bool, error) {
767767
return false, nil
768768
}
769769

770-
func (client *HyperClient) ListServices(podId string) ([]HyperService, error) {
771-
v := url.Values{}
772-
v.Set("podId", podId)
773-
body, _, err := client.call("GET", "/service/list?"+v.Encode(), "", nil)
770+
func (client *HyperClient) ListServices(podId string) ([]*grpctypes.UserService, error) {
771+
request := grpctypes.ServiceListRequest{
772+
PodID: podId,
773+
}
774+
775+
response, err := client.client.ServiceList(context.Background(), &request)
774776
if err != nil {
775777
if strings.Contains(err.Error(), "doesn't have services discovery") {
776778
return nil, nil
@@ -779,13 +781,7 @@ func (client *HyperClient) ListServices(podId string) ([]HyperService, error) {
779781
}
780782
}
781783

782-
var svcList []HyperService
783-
err = json.Unmarshal(body, &svcList)
784-
if err != nil {
785-
return nil, err
786-
}
787-
788-
return svcList, nil
784+
return response.Services, nil
789785
}
790786

791787
func (client *HyperClient) UpdateServices(podId string, services []HyperService) error {

0 commit comments

Comments
 (0)