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

Commit bbfd448

Browse files
author
Harry Zhang
committed
Clean up duplicated client code
1 parent 7f0f1a9 commit bbfd448

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

pkg/kubelet/hyper/hyperclient.go

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ type ExecInContainerOptions struct {
123123
TTY bool
124124
}
125125

126+
type HyperImage struct {
127+
repository string
128+
tag string
129+
imageID string
130+
createdAt int64
131+
virtualSize int64
132+
}
133+
126134
type hijackOptions struct {
127135
in io.Reader
128136
stdout io.Writer
@@ -311,21 +319,21 @@ func (cli *HyperClient) stream(method, path string, in io.Reader, out io.Writer,
311319

312320
}
313321

314-
func (client *HyperClient) Version() (string, error) {
322+
func (c *HyperClient) Version() (string, error) {
315323
request := grpctypes.VersionRequest{}
316324

317-
response, err := client.client.Version(context.Background(), &request)
325+
response, err := c.client.Version(context.Background(), &request)
318326
if err != nil {
319327
return "", err
320328
}
321329

322330
return response.Version, nil
323331
}
324332

325-
func (client *HyperClient) GetPodIDByName(podName string) (string, error) {
333+
func (c *HyperClient) GetPodIDByName(podName string) (string, error) {
326334
request := grpctypes.PodListRequest{}
327335

328-
response, err := client.client.PodList(context.Background(), &request)
336+
response, err := c.client.PodList(context.Background(), &request)
329337
if err != nil {
330338
return "", err
331339
}
@@ -339,10 +347,10 @@ func (client *HyperClient) GetPodIDByName(podName string) (string, error) {
339347
return "", fmt.Errorf("Can not get PodID by name %s", podName)
340348
}
341349

342-
func (client *HyperClient) ListPods() ([]HyperPod, error) {
350+
func (c *HyperClient) ListPods() ([]HyperPod, error) {
343351
request := grpctypes.PodListRequest{}
344352

345-
response, err := client.client.PodList(context.Background(), &request)
353+
response, err := c.client.PodList(context.Background(), &request)
346354
if err != nil {
347355
return nil, err
348356
}
@@ -358,7 +366,7 @@ func (client *HyperClient) ListPods() ([]HyperPod, error) {
358366

359367
req := grpctypes.PodInfoRequest{PodID: pod.PodID}
360368

361-
res, err := client.client.PodInfo(context.Background(), &req)
369+
res, err := c.client.PodInfo(context.Background(), &req)
362370
if err != nil {
363371
return nil, err
364372
}
@@ -371,10 +379,10 @@ func (client *HyperClient) ListPods() ([]HyperPod, error) {
371379
return result, nil
372380
}
373381

374-
func (client *HyperClient) ListContainers() ([]HyperContainer, error) {
382+
func (c *HyperClient) ListContainers() ([]HyperContainer, error) {
375383
request := grpctypes.ContainerListRequest{}
376384

377-
response, err := client.client.ContainerList(context.Background(), &request)
385+
response, err := c.client.ContainerList(context.Background(), &request)
378386
if err != nil {
379387
return nil, err
380388
}
@@ -393,22 +401,22 @@ func (client *HyperClient) ListContainers() ([]HyperContainer, error) {
393401
return result, nil
394402
}
395403

396-
func (client *HyperClient) Info() (*grpctypes.InfoResponse, error) {
404+
func (c *HyperClient) Info() (*grpctypes.InfoResponse, error) {
397405
request := grpctypes.InfoRequest{}
398-
response, err := client.client.Info(context.Background(), &request)
406+
response, err := c.client.Info(context.Background(), &request)
399407
if err != nil {
400408
return nil, err
401409
}
402410

403411
return response, nil
404412
}
405413

406-
func (client *HyperClient) ListImages() ([]HyperImage, error) {
414+
func (c *HyperClient) ListImages() ([]HyperImage, error) {
407415
request := grpctypes.ImageListRequest{
408416
All: false,
409417
}
410418

411-
response, err := client.client.ImageList(context.Background(), &request)
419+
response, err := c.client.ImageList(context.Background(), &request)
412420
if err != nil {
413421
return nil, err
414422
}
@@ -427,33 +435,33 @@ func (client *HyperClient) ListImages() ([]HyperImage, error) {
427435
return hyperImages, nil
428436
}
429437

430-
func (client *HyperClient) RemoveImage(imageID string) error {
438+
func (c *HyperClient) RemoveImage(imageID string) error {
431439
request := grpctypes.ImageRemoveRequest{
432440
Image: imageID,
433441
}
434442

435-
_, err := client.client.ImageRemove(context.Background(), &request)
443+
_, err := c.client.ImageRemove(context.Background(), &request)
436444
if err != nil {
437445
return err
438446
}
439447

440448
return nil
441449
}
442450

443-
func (client *HyperClient) RemovePod(podID string) error {
451+
func (c *HyperClient) RemovePod(podID string) error {
444452
request := grpctypes.PodRemoveRequest{
445453
PodID: podID,
446454
}
447-
_, err := client.client.PodRemove(context.Background(), &request)
455+
_, err := c.client.PodRemove(context.Background(), &request)
448456
if err != nil {
449457
return err
450458
}
451459

452460
return nil
453461
}
454462

455-
func (client *HyperClient) StartPod(podID string) error {
456-
stream, err := client.client.PodStart(context.Background())
463+
func (c *HyperClient) StartPod(podID string) error {
464+
stream, err := c.client.PodStart(context.Background())
457465
if err != nil {
458466
return err
459467
}
@@ -474,19 +482,19 @@ func (client *HyperClient) StartPod(podID string) error {
474482
return nil
475483
}
476484

477-
func (client *HyperClient) StopPod(podID string) error {
485+
func (c *HyperClient) StopPod(podID string) error {
478486
request := grpctypes.PodStopRequest{
479487
PodID: podID,
480488
}
481-
_, err := client.client.PodStop(context.Background(), &request)
489+
_, err := c.client.PodStop(context.Background(), &request)
482490
if err != nil {
483491
return err
484492
}
485493

486494
return nil
487495
}
488496

489-
func (client *HyperClient) PullImage(image string, credential string) error {
497+
func (c *HyperClient) PullImage(image string, credential string) error {
490498
imageName, tag := parseImageName(image)
491499
authConfig := &grpctypes.AuthConfig{}
492500
if credential != "" {
@@ -503,7 +511,7 @@ func (client *HyperClient) PullImage(image string, credential string) error {
503511
Tag: tag,
504512
Auth: authConfig,
505513
}
506-
stream, err := client.client.ImagePull(context.Background(), &request)
514+
stream, err := c.client.ImagePull(context.Background(), &request)
507515
if err != nil {
508516
return err
509517
}
@@ -521,11 +529,11 @@ func (client *HyperClient) PullImage(image string, credential string) error {
521529
return nil
522530
}
523531

524-
func (client *HyperClient) CreatePod(podSpec *grpctypes.UserPod) (string, error) {
532+
func (c *HyperClient) CreatePod(podSpec *grpctypes.UserPod) (string, error) {
525533
request := grpctypes.PodCreateRequest{
526534
PodSpec: podSpec,
527535
}
528-
response, err := client.client.PodCreate(context.Background(), &request)
536+
response, err := c.client.PodCreate(context.Background(), &request)
529537
if err != nil {
530538
return "", err
531539
}
@@ -685,7 +693,7 @@ func (client *HyperClient) Attach(opts AttachToContainerOptions) error {
685693
return client.GetExitCode(opts.Container, tag)
686694
}
687695

688-
func (client *HyperClient) Exec(opts ExecInContainerOptions) error {
696+
func (c *HyperClient) Exec(opts ExecInContainerOptions) error {
689697
if opts.Container == "" {
690698
return fmt.Errorf("No Such Container %s", opts.Container)
691699
}
@@ -696,14 +704,14 @@ func (client *HyperClient) Exec(opts ExecInContainerOptions) error {
696704
Tty: opts.TTY,
697705
}
698706

699-
createResponse, err := client.client.ExecCreate(context.Background(), &createRequest)
707+
createResponse, err := c.client.ExecCreate(context.Background(), &createRequest)
700708
if err != nil {
701709
return err
702710
}
703711

704712
execId := createResponse.ExecID
705713

706-
stream, err := client.client.ExecStart(context.Background())
714+
stream, err := c.client.ExecStart(context.Background())
707715
if err != nil {
708716
return err
709717
}
@@ -777,7 +785,7 @@ func (client *HyperClient) Exec(opts ExecInContainerOptions) error {
777785
return nil
778786
}
779787

780-
func (client *HyperClient) ContainerLogs(opts ContainerLogsOptions) error {
788+
func (c *HyperClient) ContainerLogs(opts ContainerLogsOptions) error {
781789
request := grpctypes.ContainerLogsRequest{
782790
Container: opts.Container,
783791
Follow: opts.Follow,
@@ -788,7 +796,7 @@ func (client *HyperClient) ContainerLogs(opts ContainerLogsOptions) error {
788796
Stderr: true,
789797
}
790798

791-
stream, err := client.client.ContainerLogs(context.Background(), &request)
799+
stream, err := c.client.ContainerLogs(context.Background(), &request)
792800
if err != nil {
793801
return err
794802
}
@@ -831,12 +839,12 @@ func (client *HyperClient) IsImagePresent(repo, tag string) (bool, error) {
831839
return false, nil
832840
}
833841

834-
func (client *HyperClient) ListServices(podId string) ([]*grpctypes.UserService, error) {
842+
func (c *HyperClient) ListServices(podId string) ([]*grpctypes.UserService, error) {
835843
request := grpctypes.ServiceListRequest{
836844
PodID: podId,
837845
}
838846

839-
response, err := client.client.ServiceList(context.Background(), &request)
847+
response, err := c.client.ServiceList(context.Background(), &request)
840848
if err != nil {
841849
if strings.Contains(err.Error(), "doesn't have services discovery") {
842850
return nil, nil
@@ -848,28 +856,28 @@ func (client *HyperClient) ListServices(podId string) ([]*grpctypes.UserService,
848856
return response.Services, nil
849857
}
850858

851-
func (client *HyperClient) UpdateServices(podId string, services []*grpctypes.UserService) error {
859+
func (c *HyperClient) UpdateServices(podId string, services []*grpctypes.UserService) error {
852860
request := grpctypes.ServiceUpdateRequest{
853861
PodID: podId,
854862
Services: services,
855863
}
856864

857-
_, err := client.client.ServiceUpdate(context.Background(), &request)
865+
_, err := c.client.ServiceUpdate(context.Background(), &request)
858866
if err != nil {
859867
return err
860868
}
861869

862870
return nil
863871
}
864872

865-
func (client *HyperClient) UpdatePodLabels(podId string, labels map[string]string) error {
873+
func (c *HyperClient) UpdatePodLabels(podId string, labels map[string]string) error {
866874
request := grpctypes.PodLabelsRequest{
867875
PodID: podId,
868876
Override: true,
869877
Labels: labels,
870878
}
871879

872-
_, err := client.client.SetPodLabels(context.Background(), &request)
880+
_, err := c.client.SetPodLabels(context.Background(), &request)
873881
if err != nil {
874882
return err
875883
}

pkg/kubelet/hyper/types.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ const (
2323
StatusSuccess = "succeeded"
2424
)
2525

26-
type HyperImage struct {
27-
repository string
28-
tag string
29-
imageID string
30-
createdAt int64
31-
virtualSize int64
32-
}
33-
3426
// Container JSON Data Structure
3527
type ContainerPort struct {
3628
Name string `json:"name"`

0 commit comments

Comments
 (0)