mirror of https://github.com/helm/helm
Merge pull request #6011 from thomastaylor312/feat/atomic
feat(*) Adds atomic flag to v3pull/6059/head
Taylor Thomas
5 years ago
committed by
GitHub
commit
2c397b6879
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,109 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package action
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
kubefake "helm.sh/helm/pkg/kube/fake"
|
||||||
|
"helm.sh/helm/pkg/release"
|
||||||
|
)
|
||||||
|
|
||||||
|
func upgradeAction(t *testing.T) *Upgrade {
|
||||||
|
config := actionConfigFixture(t)
|
||||||
|
upAction := NewUpgrade(config)
|
||||||
|
upAction.Namespace = "spaced"
|
||||||
|
|
||||||
|
return upAction
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUpgradeRelease_Wait(t *testing.T) {
|
||||||
|
is := assert.New(t)
|
||||||
|
req := require.New(t)
|
||||||
|
|
||||||
|
upAction := upgradeAction(t)
|
||||||
|
rel := releaseStub()
|
||||||
|
rel.Name = "come-fail-away"
|
||||||
|
rel.Info.Status = release.StatusDeployed
|
||||||
|
upAction.cfg.Releases.Create(rel)
|
||||||
|
|
||||||
|
failer := upAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
|
||||||
|
failer.WaitError = fmt.Errorf("I timed out")
|
||||||
|
upAction.cfg.KubeClient = failer
|
||||||
|
upAction.Wait = true
|
||||||
|
upAction.rawValues = map[string]interface{}{}
|
||||||
|
|
||||||
|
res, err := upAction.Run(rel.Name, buildChart())
|
||||||
|
req.Error(err)
|
||||||
|
is.Contains(res.Info.Description, "I timed out")
|
||||||
|
is.Equal(res.Info.Status, release.StatusFailed)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUpgradeRelease_Atomic(t *testing.T) {
|
||||||
|
is := assert.New(t)
|
||||||
|
req := require.New(t)
|
||||||
|
|
||||||
|
t.Run("atomic rollback succeeds", func(t *testing.T) {
|
||||||
|
upAction := upgradeAction(t)
|
||||||
|
|
||||||
|
rel := releaseStub()
|
||||||
|
rel.Name = "nuketown"
|
||||||
|
rel.Info.Status = release.StatusDeployed
|
||||||
|
upAction.cfg.Releases.Create(rel)
|
||||||
|
|
||||||
|
failer := upAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
|
||||||
|
// We can't make Update error because then the rollback won't work
|
||||||
|
failer.WatchUntilReadyError = fmt.Errorf("arming key removed")
|
||||||
|
upAction.cfg.KubeClient = failer
|
||||||
|
upAction.Atomic = true
|
||||||
|
upAction.rawValues = map[string]interface{}{}
|
||||||
|
|
||||||
|
res, err := upAction.Run(rel.Name, buildChart())
|
||||||
|
req.Error(err)
|
||||||
|
is.Contains(err.Error(), "arming key removed")
|
||||||
|
is.Contains(err.Error(), "atomic")
|
||||||
|
|
||||||
|
// Now make sure it is actually upgraded
|
||||||
|
updatedRes, err := upAction.cfg.Releases.Get(res.Name, 3)
|
||||||
|
is.NoError(err)
|
||||||
|
// Should have rolled back to the previous
|
||||||
|
is.Equal(updatedRes.Info.Status, release.StatusDeployed)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("atomic uninstall fails", func(t *testing.T) {
|
||||||
|
upAction := upgradeAction(t)
|
||||||
|
rel := releaseStub()
|
||||||
|
rel.Name = "fallout"
|
||||||
|
rel.Info.Status = release.StatusDeployed
|
||||||
|
upAction.cfg.Releases.Create(rel)
|
||||||
|
|
||||||
|
failer := upAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
|
||||||
|
failer.UpdateError = fmt.Errorf("update fail")
|
||||||
|
upAction.cfg.KubeClient = failer
|
||||||
|
upAction.Atomic = true
|
||||||
|
upAction.rawValues = map[string]interface{}{}
|
||||||
|
|
||||||
|
_, err := upAction.Run(rel.Name, buildChart())
|
||||||
|
req.Error(err)
|
||||||
|
is.Contains(err.Error(), "update fail")
|
||||||
|
is.Contains(err.Error(), "an error occurred while rolling back the release")
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -0,0 +1,116 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Package fake implements various fake KubeClients for use in testing
|
||||||
|
package fake
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
v1 "k8s.io/api/core/v1"
|
||||||
|
"k8s.io/cli-runtime/pkg/resource"
|
||||||
|
|
||||||
|
"helm.sh/helm/pkg/kube"
|
||||||
|
)
|
||||||
|
|
||||||
|
// FailingKubeClient implements KubeClient for testing purposes. It also has
|
||||||
|
// additional errors you can set to fail different functions, otherwise it
|
||||||
|
// delegates all its calls to `PrintingKubeClient`
|
||||||
|
type FailingKubeClient struct {
|
||||||
|
PrintingKubeClient
|
||||||
|
CreateError error
|
||||||
|
WaitError error
|
||||||
|
GetError error
|
||||||
|
DeleteError error
|
||||||
|
WatchUntilReadyError error
|
||||||
|
UpdateError error
|
||||||
|
BuildError error
|
||||||
|
BuildUnstructuredError error
|
||||||
|
WaitAndGetCompletedPodPhaseError error
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) Create(r io.Reader) error {
|
||||||
|
if f.CreateError != nil {
|
||||||
|
return f.CreateError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Create(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) Wait(r io.Reader, d time.Duration) error {
|
||||||
|
if f.WaitError != nil {
|
||||||
|
return f.WaitError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Wait(r, d)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) Get(r io.Reader) (string, error) {
|
||||||
|
if f.GetError != nil {
|
||||||
|
return "", f.GetError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Get(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) Delete(r io.Reader) error {
|
||||||
|
if f.DeleteError != nil {
|
||||||
|
return f.DeleteError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Delete(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WatchUntilReady returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) WatchUntilReady(r io.Reader, d time.Duration) error {
|
||||||
|
if f.WatchUntilReadyError != nil {
|
||||||
|
return f.WatchUntilReadyError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.WatchUntilReady(r, d)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) Update(r, modifiedReader io.Reader, not, needed bool) error {
|
||||||
|
if f.UpdateError != nil {
|
||||||
|
return f.UpdateError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Update(r, modifiedReader, not, needed)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) Build(r io.Reader) (kube.Result, error) {
|
||||||
|
if f.BuildError != nil {
|
||||||
|
return []*resource.Info{}, f.BuildError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Build(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildUnstructured returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) BuildUnstructured(r io.Reader) (kube.Result, error) {
|
||||||
|
if f.BuildUnstructuredError != nil {
|
||||||
|
return []*resource.Info{}, f.BuildUnstructuredError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.Build(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WaitAndGetCompletedPodPhase returns the configured error if set or prints
|
||||||
|
func (f *FailingKubeClient) WaitAndGetCompletedPodPhase(s string, d time.Duration) (v1.PodPhase, error) {
|
||||||
|
if f.WaitAndGetCompletedPodPhaseError != nil {
|
||||||
|
return v1.PodSucceeded, f.WaitAndGetCompletedPodPhaseError
|
||||||
|
}
|
||||||
|
return f.PrintingKubeClient.WaitAndGetCompletedPodPhase(s, d)
|
||||||
|
}
|
||||||
Loading…
Reference in new issue