From 9f4299e57a297fd2f707dd7934678638408e97c8 Mon Sep 17 00:00:00 2001
From: devinyan <devinyan@tencent.com>
Date: Mon, 8 May 2017 10:41:19 +0800
Subject: [PATCH] bug fix 3

---
 cmd/rudder/rudder.go          | 3 ++-
 pkg/rudder/client.go          | 6 +++---
 pkg/tiller/release_modules.go | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmd/rudder/rudder.go b/cmd/rudder/rudder.go
index 800678c76..836a0452e 100644
--- a/cmd/rudder/rudder.go
+++ b/cmd/rudder/rudder.go
@@ -126,8 +126,9 @@ func (r *ReleaseModuleServiceServer) UpgradeRelease(ctx context.Context, in *rud
 	return &rudderAPI.UpgradeReleaseResponse{}, err
 }
 
-func (r *ReleaseModuleServiceServer) ReleaseStatus(ctx context.Context, in *rudderAPI.ReleaseStatusRequest, filter kube.FilterStruct) (*rudderAPI.ReleaseStatusResponse, error) {
+func (r *ReleaseModuleServiceServer) ReleaseStatus(ctx context.Context, in *rudderAPI.ReleaseStatusRequest) (*rudderAPI.ReleaseStatusResponse, error) {
 	grpclog.Print("status")
+        var filter kube.FilterStruct = kube.FilterStruct{Kind:"",Instance:""}
 
 	resp, err := kubeClient.Get(in.Release.Namespace, bytes.NewBufferString(in.Release.Manifest),filter)
 	in.Release.Info.Status.Resources = resp
diff --git a/pkg/rudder/client.go b/pkg/rudder/client.go
index dd957eb0f..6b7408f90 100644
--- a/pkg/rudder/client.go
+++ b/pkg/rudder/client.go
@@ -23,7 +23,7 @@ import (
 	"google.golang.org/grpc"
 
 	rudderAPI "k8s.io/helm/pkg/proto/hapi/rudder"
-	"k8s.io/helm/pkg/kube"
+
 )
 
 // GrpcPort specifies port on which rudder will spawn a server
@@ -69,14 +69,14 @@ func RollbackRelease(req *rudderAPI.RollbackReleaseRequest) (*rudderAPI.Rollback
 }
 
 // ReleaseStatus calls Rudder ReleaseStatus method which should perform update
-func ReleaseStatus(req *rudderAPI.ReleaseStatusRequest, filter kube.FilterStruct) (*rudderAPI.ReleaseStatusResponse, error) {
+func ReleaseStatus(req *rudderAPI.ReleaseStatusRequest) (*rudderAPI.ReleaseStatusResponse, error) {
 	conn, err := grpc.Dial(grpcAddr, grpc.WithInsecure())
 	if err != nil {
 		return nil, err
 	}
 	defer conn.Close()
 	client := rudderAPI.NewReleaseModuleServiceClient(conn)
-	return client.ReleaseStatus(context.Background(), req,filter)
+	return client.ReleaseStatus(context.Background(), req)
 }
 
 // DeleteRelease calls Rudder DeleteRelease method which should uninstall provided release
diff --git a/pkg/tiller/release_modules.go b/pkg/tiller/release_modules.go
index e59abd136..c06241a45 100644
--- a/pkg/tiller/release_modules.go
+++ b/pkg/tiller/release_modules.go
@@ -120,9 +120,9 @@ func (m *RemoteReleaseModule) Rollback(current, target *release.Release, req *se
 }
 
 // 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) (string, error) {
 	statusRequest := &rudderAPI.ReleaseStatusRequest{Release: r}
-	resp, err := rudder.ReleaseStatus(statusRequest,filter)
+	resp, err := rudder.ReleaseStatus(statusRequest)
 	return resp.Info.Status.Resources, err
 }