ci bug fix 4

pull/2411/head
devinyan 9 years ago
parent 9f4299e57a
commit 3352a3bde7

@ -40,7 +40,7 @@ type ReleaseModule interface {
Create(r *release.Release, req *services.InstallReleaseRequest, env *environment.Environment) error Create(r *release.Release, req *services.InstallReleaseRequest, env *environment.Environment) error
Update(current, target *release.Release, req *services.UpdateReleaseRequest, 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 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) 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 // 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) return env.KubeClient.Get(r.Namespace, bytes.NewBufferString(r.Manifest),filter)
} }

@ -262,12 +262,9 @@ func (s *ReleaseServer) GetReleaseStatus(c ctx.Context, req *services.GetRelease
Info: rel.Info, 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 // 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. // 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 { if sc == release.Status_DELETED || sc == release.Status_FAILED {
// Skip errors if this is already deleted or failed. // Skip errors if this is already deleted or failed.

Loading…
Cancel
Save