helm
/
helm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(tiller): do not create releases for a dry-run

This commit is contained in:
Adam Reese 2016-09-27 16:58:56 -07:00
parent ac88aaf218
commit 3f1101cdfb
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/tiller/release_server.go
View File

@ -174,8 +174,7 @@ func (s *releaseServer) ListReleases(req *services.ListReleasesRequest, stream s
Total: total,
Releases: rels,
}
stream.Send(res)
return nil
return stream.Send(res)
}
func filterReleases(filter string, rels []*release.Release) ([]*release.Release, error) {
@ -281,8 +280,10 @@ func (s *releaseServer) UpdateRelease(c ctx.Context, req *services.UpdateRelease
return nil, err
}
if err := s.env.Releases.Create(updatedRelease); err != nil {
return nil, err
if !req.DryRun {
if err := s.env.Releases.Create(updatedRelease); err != nil {
return nil, err
}
}
return res, nil
@ -380,6 +381,9 @@ func (s *releaseServer) prepareUpdate(req *services.UpdateReleaseRequest) (*rele
}
func (s *releaseServer) RollbackRelease(c ctx.Context, req *services.RollbackReleaseRequest) (*services.RollbackReleaseResponse, error) {
if !checkClientVersion(c) {
return nil, errIncompatibleVersion
}
currentRelease, targetRelease, err := s.prepareRollback(req)
if err != nil {
@ -391,8 +395,10 @@ func (s *releaseServer) RollbackRelease(c ctx.Context, req *services.RollbackRel
return nil, err
}
if err := s.env.Releases.Create(targetRelease); err != nil {
return nil, err
if !req.DryRun {
if err := s.env.Releases.Create(targetRelease); err != nil {
return nil, err
}
}
return rel, nil
@ -438,10 +444,7 @@ func (s *releaseServer) performKubeUpdate(currentRelease, targetRelease *release
kubeCli := s.env.KubeClient
current := bytes.NewBufferString(currentRelease.Manifest)
target := bytes.NewBufferString(targetRelease.Manifest)
if err := kubeCli.Update(targetRelease.Namespace, current, target); err != nil {
return err
}
return nil
return kubeCli.Update(targetRelease.Namespace, current, target)
}
// prepareRollback finds the previous release and prepares a new release object with

4
cmd/tiller/release_server_test.go
View File

@ -629,7 +629,7 @@ func TestUpdateReleaseNoChanges(t *testing.T) {
}
func TestRollbackReleaseNoHooks(t *testing.T) {
c := context.Background()
c := helm.NewContext()
rs := rsFixture()
rel := releaseStub()
rel.Hooks = []*release.Hook{
@ -665,7 +665,7 @@ func TestRollbackReleaseNoHooks(t *testing.T) {
}
func TestRollbackRelease(t *testing.T) {
c := context.Background()
c := helm.NewContext()
rs := rsFixture()
rel := releaseStub()
rs.env.Releases.Create(rel)