upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(tiller): Upgrade shouldn't fail if there are no changes

Browse source 
Signed-off-by: Keerthan Reddy Mala (kmala) <kmala@deis.com>
This commit is contained in:
Keerthan Reddy Mala (kmala) 2016-09-13 19:47:43 -06:00 committed by Keerthan Reddy Mala (kmala)
parent c96c1d0ad3
commit 55dc7b690f
No known key found for this signature in database
GPG key ID: 6CDEEEEF785DE6C4
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmd/tiller/release_server_test.go
View file

@ -582,6 +582,24 @@ func TestUpdateReleaseNoHooks(t *testing.T) {
}
func TestUpdateReleaseNoChanges(t *testing.T) {
c := context.Background()
rs := rsFixture()
rel := releaseStub()
rs.env.Releases.Create(rel)
req := &services.UpdateReleaseRequest{
Name: rel.Name,
DisableHooks: true,
Chart: rel.GetChart(),
}
_, err := rs.UpdateRelease(c, req)
if err != nil {
t.Fatalf("Failed updated: %s", err)
}
}
func TestUninstallRelease(t *testing.T) {
c := context.Background()
rs := rsFixture()

19
pkg/kube/client.go
View file

@ -56,6 +56,15 @@ func New(config clientcmd.ClientConfig) *Client {
// ResourceActorFunc performs an action on a single resource.
type ResourceActorFunc func(*resource.Info) error
// ErrAlreadyExists can be returned where there are no changes
type ErrAlreadyExists struct {
errorMsg string
}
func (e ErrAlreadyExists) Error() string {
return fmt.Sprintf("Looks like there are no changes for %s", e.errorMsg)
}
// APIClient returns a Kubernetes API client.
//
// This is necessary because cmdutil.Client is a field, not a method, which
@ -189,8 +198,12 @@ func (c *Client) Update(namespace string, currentReader, targetReader io.Reader)
}
if err := updateResource(info, currentObj); err != nil {
log.Printf("error updating the resource %s:\n\t %v", resourceName, err)
updateErrors = append(updateErrors, err.Error())
if alreadyExistErr, ok := err.(ErrAlreadyExists); ok {
log.Printf(alreadyExistErr.errorMsg)
} else {
log.Printf("error updating the resource %s:\n\t %v", resourceName, err)
updateErrors = append(updateErrors, err.Error())
}
}
return nil
@ -330,7 +343,7 @@ func updateResource(target *resource.Info, currentObj runtime.Object) error {
}
if reflect.DeepEqual(originalJS, editedJS) {
return fmt.Errorf("Looks like there are no changes for %s", target.Name)
return ErrAlreadyExists{target.Name}
}
patch, err := strategicpatch.CreateStrategicMergePatch(originalJS, editedJS, currentObj)