ci debug fix 2

pull/2411/head
devinyan 9 years ago
parent 8054f970ae
commit 2bde5a0e75

@ -126,10 +126,10 @@ func (r *ReleaseModuleServiceServer) UpgradeRelease(ctx context.Context, in *rud
return &rudderAPI.UpgradeReleaseResponse{}, err return &rudderAPI.UpgradeReleaseResponse{}, err
} }
func (r *ReleaseModuleServiceServer) ReleaseStatus(ctx context.Context, in *rudderAPI.ReleaseStatusRequest) (*rudderAPI.ReleaseStatusResponse, error) { func (r *ReleaseModuleServiceServer) ReleaseStatus(ctx context.Context, in *rudderAPI.ReleaseStatusRequest, filter kube.FilterStruct) (*rudderAPI.ReleaseStatusResponse, error) {
grpclog.Print("status") grpclog.Print("status")
resp, err := kubeClient.Get(in.Release.Namespace, bytes.NewBufferString(in.Release.Manifest)) resp, err := kubeClient.Get(in.Release.Namespace, bytes.NewBufferString(in.Release.Manifest),filter)
in.Release.Info.Status.Resources = resp in.Release.Info.Status.Resources = resp
return &rudderAPI.ReleaseStatusResponse{ return &rudderAPI.ReleaseStatusResponse{
Release: in.Release, Release: in.Release,

@ -23,6 +23,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
rudderAPI "k8s.io/helm/pkg/proto/hapi/rudder" rudderAPI "k8s.io/helm/pkg/proto/hapi/rudder"
"k8s.io/helm/pkg/kube"
) )
// GrpcPort specifies port on which rudder will spawn a server // GrpcPort specifies port on which rudder will spawn a server
@ -68,14 +69,14 @@ func RollbackRelease(req *rudderAPI.RollbackReleaseRequest) (*rudderAPI.Rollback
} }
// ReleaseStatus calls Rudder ReleaseStatus method which should perform update // ReleaseStatus calls Rudder ReleaseStatus method which should perform update
func ReleaseStatus(req *rudderAPI.ReleaseStatusRequest) (*rudderAPI.ReleaseStatusResponse, error) { func ReleaseStatus(req *rudderAPI.ReleaseStatusRequest, filter kube.FilterStruct) (*rudderAPI.ReleaseStatusResponse, error) {
conn, err := grpc.Dial(grpcAddr, grpc.WithInsecure()) conn, err := grpc.Dial(grpcAddr, grpc.WithInsecure())
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer conn.Close() defer conn.Close()
client := rudderAPI.NewReleaseModuleServiceClient(conn) client := rudderAPI.NewReleaseModuleServiceClient(conn)
return client.ReleaseStatus(context.Background(), req) return client.ReleaseStatus(context.Background(), req,filter)
} }
// DeleteRelease calls Rudder DeleteRelease method which should uninstall provided release // DeleteRelease calls Rudder DeleteRelease method which should uninstall provided release

@ -122,7 +122,7 @@ func (m *RemoteReleaseModule) Rollback(current, target *release.Release, req *se
// Status returns status retrieved from rudder.ReleaseStatus // Status returns status retrieved from rudder.ReleaseStatus
func (m *RemoteReleaseModule) Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment, filter kube.FilterStruct) (string, error) { func (m *RemoteReleaseModule) Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment, filter kube.FilterStruct) (string, error) {
statusRequest := &rudderAPI.ReleaseStatusRequest{Release: r} statusRequest := &rudderAPI.ReleaseStatusRequest{Release: r}
resp, err := rudder.ReleaseStatus(statusRequest) resp, err := rudder.ReleaseStatus(statusRequest,filter)
return resp.Info.Status.Resources, err return resp.Info.Status.Resources, err
} }

Loading…
Cancel
Save