From 3352a3bde7843ff93f5578f080068c82bc96a365 Mon Sep 17 00:00:00 2001 From: devinyan Date: Mon, 8 May 2017 11:07:35 +0800 Subject: [PATCH] ci bug fix 4 --- pkg/tiller/release_modules.go | 6 ++++-- pkg/tiller/release_server.go | 5 +---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/tiller/release_modules.go b/pkg/tiller/release_modules.go index c06241a45..35b8e72be 100644 --- a/pkg/tiller/release_modules.go +++ b/pkg/tiller/release_modules.go @@ -40,7 +40,7 @@ type ReleaseModule interface { Create(r *release.Release, req *services.InstallReleaseRequest, env *environment.Environment) error Update(current, target *release.Release, req *services.UpdateReleaseRequest, env *environment.Environment) error Rollback(current, target *release.Release, req *services.RollbackReleaseRequest, env *environment.Environment) error - Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment,filter kube.FilterStruct) (string, error) + Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment) (string, error) Delete(r *release.Release, req *services.UninstallReleaseRequest, env *environment.Environment) (string, []error) } @@ -70,7 +70,9 @@ func (m *LocalReleaseModule) Rollback(current, target *release.Release, req *ser } // Status returns kubectl-like formatted status of release objects -func (m *LocalReleaseModule) Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment, filter kube.FilterStruct) (string, error) { +func (m *LocalReleaseModule) Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment) (string, error) { + var filter kube.FilterStruct = kube.FilterStruct{Kind:req.Kind,Instance:req.Instance} + return env.KubeClient.Get(r.Namespace, bytes.NewBufferString(r.Manifest),filter) } diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index 5be7343ea..6179d7525 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -262,12 +262,9 @@ func (s *ReleaseServer) GetReleaseStatus(c ctx.Context, req *services.GetRelease Info: rel.Info, } - - var filter kube.FilterStruct = kube.FilterStruct{Kind:req.Kind,Instance:req.Instance} - // Ok, we got the status of the release as we had jotted down, now we need to match the // manifest we stashed away with reality from the cluster. - resp, err := s.ReleaseModule.Status(rel, req, s.env,filter) + resp, err := s.ReleaseModule.Status(rel, req, s.env) if sc == release.Status_DELETED || sc == release.Status_FAILED { // Skip errors if this is already deleted or failed.