From 1f91d50239eec3a980a55d6d749c1acce271a0f1 Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Fri, 17 Mar 2017 10:49:38 +0200 Subject: [PATCH] Define both rudder port and rudder address for different needs --- cmd/rudder/rudder.go | 2 +- pkg/rudder/client.go | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cmd/rudder/rudder.go b/cmd/rudder/rudder.go index 2b056c692..9169c2ce9 100644 --- a/cmd/rudder/rudder.go +++ b/cmd/rudder/rudder.go @@ -34,7 +34,7 @@ import ( var kubeClient = kube.New(nil) func main() { - lis, err := net.Listen("tcp", fmt.Sprintf(":%d", rudder.GrpcAddr)) + lis, err := net.Listen("tcp", fmt.Sprintf(":%d", rudder.GrpcPort)) if err != nil { grpclog.Fatalf("failed to listen: %v", err) } diff --git a/pkg/rudder/client.go b/pkg/rudder/client.go index af1e5dd45..694095ef8 100644 --- a/pkg/rudder/client.go +++ b/pkg/rudder/client.go @@ -17,19 +17,25 @@ limitations under the License. package rudder // import "k8s.io/helm/pkg/rudder" import ( + "fmt" + "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/helm/pkg/proto/hapi/release" ) -// GrpcAddr is an address that should be used to access Rudder service -const GrpcAddr = "127.0.0.1:10001" +// GrpcPort specifies port on which rudder will spawn a server +const ( + GrpcPort = 10001 +) + +var grpcAddr = fmt.Sprintf("127.0.0.1:%d", GrpcPort) // InstallRelease calls Rudder InstallRelease method which should create provided release func InstallRelease(rel *release.InstallReleaseRequest) (*release.InstallReleaseResponse, error) { //TODO(mkwiek): parametrize this - conn, err := grpc.Dial(GrpcAddr, grpc.WithInsecure()) + conn, err := grpc.Dial(grpcAddr, grpc.WithInsecure()) if err != nil { return nil, err } @@ -41,7 +47,7 @@ func InstallRelease(rel *release.InstallReleaseRequest) (*release.InstallRelease // UpgradeRelease calls Rudder UpgradeRelease method which should perform update func UpgradeRelease(req *release.UpgradeReleaseRequest) (*release.UpgradeReleaseResponse, error) { - conn, err := grpc.Dial(GrpcAddr, grpc.WithInsecure()) + conn, err := grpc.Dial(grpcAddr, grpc.WithInsecure()) if err != nil { return nil, err } @@ -52,7 +58,7 @@ func UpgradeRelease(req *release.UpgradeReleaseRequest) (*release.UpgradeRelease // RollbackRelease calls Rudder RollbackRelease method which should perform update func RollbackRelease(req *release.RollbackReleaseRequest) (*release.RollbackReleaseResponse, error) { - conn, err := grpc.Dial(GrpcAddr, grpc.WithInsecure()) + conn, err := grpc.Dial(grpcAddr, grpc.WithInsecure()) if err != nil { return nil, err }