Skip to content
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

add common package #491

Merged
merged 1 commit into from
May 9, 2019
Merged

add common package #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pkg/types.go → pkg/common/v1alpha1/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pkg
package v1alpha1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe name this package common ?

Copy link
Member Author

@hougangliu hougangliu May 9, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

based on golang best practices, package name should keep same as its directory name. all Katit packages follow this style.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think we should keep v1alpha1


import (
"os"
Expand Down
31 changes: 31 additions & 0 deletions pkg/common/v1alpha2/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package v1alpha2

import (
"os"

experimentsv1alpha2 "github.com/kubeflow/katib/pkg/api/operators/apis/experiment/v1alpha2"
)

const (
KatibManagerServiceIPEnvName = "KATIB_MANAGER_PORT_6789_TCP_ADDR"
KatibManagerServicePortEnvName = "KATIB_MANAGER_PORT_6789_TCP_PORT"
KatibManagerServiceNamespaceEnvName = "KATIB_MANAGER_NAMESPACE"
KatibManagerService = "katib-manager"
KatibManagerPort = "6789"
ManagerAddr = KatibManagerService + ":" + KatibManagerPort
)

func GetManagerAddr() string {
ns := os.Getenv(experimentsv1alpha2.DefaultKatibNamespaceEnvName)
if len(ns) == 0 {
addr := os.Getenv(KatibManagerServiceIPEnvName)
port := os.Getenv(KatibManagerServicePortEnvName)
if len(addr) > 0 && len(port) > 0 {
return addr + ":" + port
} else {
return ManagerAddr
}
} else {
return KatibManagerService + "." + ns + ":" + KatibManagerPort
}
}
6 changes: 3 additions & 3 deletions pkg/controller/v1alpha1/studyjob/katib_api_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"log"
"reflect"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
katibv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1"
katibapi "github.com/kubeflow/katib/pkg/api/v1alpha1"
"google.golang.org/grpc"
Expand All @@ -37,7 +37,7 @@ func initializeStudy(instance *katibv1alpha1.StudyJob) error {

instance.Status.Condition = katibv1alpha1.ConditionRunning

conn, err := grpc.Dial(pkg.ManagerAddr, grpc.WithInsecure())
conn, err := grpc.Dial(common.ManagerAddr, grpc.WithInsecure())
if err != nil {
log.Printf("Connect katib manager error %v", err)
instance.Status.Condition = katibv1alpha1.ConditionFailed
Expand Down Expand Up @@ -248,7 +248,7 @@ func populateConfigForNAS(instance *katibv1alpha1.StudyJob) (*katibapi.StudyConf
}

func deleteStudy(instance *katibv1alpha1.StudyJob) error {
conn, err := grpc.Dial(pkg.ManagerAddr, grpc.WithInsecure())
conn, err := grpc.Dial(common.ManagerAddr, grpc.WithInsecure())
if err != nil {
log.Printf("Connect katib manager error %v", err)
return err
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/v1alpha1/studyjob/manifest_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"text/template"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
katibv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1"
katibapi "github.com/kubeflow/katib/pkg/api/v1alpha1"
"github.com/kubeflow/katib/pkg/manager/v1alpha1/studyjobclient"
Expand Down Expand Up @@ -100,7 +100,7 @@ func getMetricsCollectorManifest(studyID string, trialID string, workerID string
"WorkerID": workerID,
"WorkerKind": workerKind,
"NameSpace": namespace,
"ManagerSerivce": pkg.GetManagerAddr(),
"ManagerSerivce": common.GetManagerAddr(),
}
if mcs != nil && mcs.GoTemplate.RawTemplate != "" {
mtp, err = template.New("MetricsCollector").Parse(mcs.GoTemplate.RawTemplate)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/v1alpha1/studyjob/studyjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"log"
"strconv"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
katibv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1"
katibapi "github.com/kubeflow/katib/pkg/api/v1alpha1"
pytorchjobv1beta1 "github.com/kubeflow/pytorch-operator/pkg/apis/pytorch/v1beta1"
Expand Down Expand Up @@ -484,7 +484,7 @@ func (r *ReconcileStudyJobController) checkStatus(instance *katibv1alpha1.StudyJ
grpc.WithInsecure(),
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)),
}
conn, err := grpc.Dial(pkg.ManagerAddr, opts...)
conn, err := grpc.Dial(common.ManagerAddr, opts...)
if err != nil {
log.Printf("Connect katib manager error %v", err)
instance.Status.Condition = katibv1alpha1.ConditionFailed
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/v1alpha2/experiment/util/manifest_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"text/template"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha2"
katibv1alpha2 "github.com/kubeflow/katib/pkg/api/operators/apis/experiment/v1alpha2"
"github.com/kubeflow/katib/pkg/util/v1alpha2/katibclient"

Expand All @@ -35,7 +35,7 @@ func getMetricsCollectorManifest(experimentName string, trialName string, jobKin
"Trial": trialName,
"JobKind": jobKind,
"NameSpace": namespace,
"ManagerService": pkg.GetManagerAddr(),
"ManagerService": common.GetManagerAddr(),
"MetricNames": strings.Join(metricNames, ";"),
}
if mcs != nil && mcs.GoTemplate.RawTemplate != "" {
Expand Down
4 changes: 2 additions & 2 deletions pkg/suggestion/v1alpha1/grid_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"strconv"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
"github.com/kubeflow/katib/pkg/api/v1alpha1"

"google.golang.org/grpc"
Expand Down Expand Up @@ -138,7 +138,7 @@ func (s *GridSuggestService) genGrids(studyID string, pcs []*api.ParameterConfig
}

func (s *GridSuggestService) GetSuggestions(ctx context.Context, in *api.GetSuggestionsRequest) (*api.GetSuggestionsReply, error) {
conn, err := grpc.Dial(pkg.ManagerAddr, grpc.WithInsecure())
conn, err := grpc.Dial(common.ManagerAddr, grpc.WithInsecure())
if err != nil {
log.Printf("could not connect: %v", err)
return &api.GetSuggestionsReply{}, err
Expand Down
4 changes: 2 additions & 2 deletions pkg/suggestion/v1alpha1/hyperband_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
"github.com/kubeflow/katib/pkg/api/v1alpha1"

"google.golang.org/grpc"
Expand Down Expand Up @@ -403,7 +403,7 @@ func (h *HyperBandSuggestService) shLoopParamUpdate(studyID string, hbparam *Hyp
}

func (h *HyperBandSuggestService) GetSuggestions(ctx context.Context, in *api.GetSuggestionsRequest) (*api.GetSuggestionsReply, error) {
conn, err := grpc.Dial(pkg.ManagerAddr, grpc.WithInsecure())
conn, err := grpc.Dial(common.ManagerAddr, grpc.WithInsecure())
if err != nil {
log.Fatalf("could not connect: %v", err)
return &api.GetSuggestionsReply{}, err
Expand Down
4 changes: 2 additions & 2 deletions pkg/suggestion/v1alpha1/random_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"time"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
"github.com/kubeflow/katib/pkg/api/v1alpha1"
"google.golang.org/grpc"
)
Expand All @@ -33,7 +33,7 @@ func (s *RandomSuggestService) IntRandom(min, max int) int {
}

func (s *RandomSuggestService) GetSuggestions(ctx context.Context, in *api.GetSuggestionsRequest) (*api.GetSuggestionsReply, error) {
conn, err := grpc.Dial(pkg.ManagerAddr, grpc.WithInsecure())
conn, err := grpc.Dial(common.ManagerAddr, grpc.WithInsecure())
if err != nil {
log.Fatalf("could not connect: %v", err)
return &api.GetSuggestionsReply{}, err
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/kubeflow/katib/pkg"
common "github.com/kubeflow/katib/pkg/common/v1alpha1"
studyjobv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1"
"github.com/kubeflow/katib/pkg/api/v1alpha1"
"github.com/kubeflow/katib/pkg/manager/v1alpha1/studyjobclient"
Expand Down Expand Up @@ -54,7 +54,7 @@ func (k *KatibUIHandler) connectManager() (*grpc.ClientConn, api.ManagerClient,
grpc.WithInsecure(),
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)),
}
conn, err := grpc.Dial(pkg.ManagerAddr, opts...)
conn, err := grpc.Dial(common.ManagerAddr, opts...)
if err != nil {
log.Printf("Connect katib manager error %v", err)
return nil, nil, err
Expand Down