diff --git a/cmd/rudder/rudder.go b/cmd/rudder/rudder.go index 0a5a97bff..800678c76 100644 --- a/cmd/rudder/rudder.go +++ b/cmd/rudder/rudder.go @@ -126,10 +126,10 @@ func (r *ReleaseModuleServiceServer) UpgradeRelease(ctx context.Context, in *rud 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") - 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 return &rudderAPI.ReleaseStatusResponse{ Release: in.Release, diff --git a/pkg/rudder/client.go b/pkg/rudder/client.go index 219bb010a..dd957eb0f 100644 --- a/pkg/rudder/client.go +++ b/pkg/rudder/client.go @@ -23,6 +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 @@ -68,14 +69,14 @@ func RollbackRelease(req *rudderAPI.RollbackReleaseRequest) (*rudderAPI.Rollback } // 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()) if err != nil { return nil, err } defer conn.Close() 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 diff --git a/pkg/tiller/release_modules.go b/pkg/tiller/release_modules.go index 0a97abebe..e59abd136 100644 --- a/pkg/tiller/release_modules.go +++ b/pkg/tiller/release_modules.go @@ -122,7 +122,7 @@ 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) { statusRequest := &rudderAPI.ReleaseStatusRequest{Release: r} - resp, err := rudder.ReleaseStatus(statusRequest) + resp, err := rudder.ReleaseStatus(statusRequest,filter) return resp.Info.Status.Resources, err }