diff --git a/pkg/action/action.go b/pkg/action/action.go index 7edb4a1ae..0157ce1cc 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -371,7 +371,7 @@ func (cfg *Configuration) recordRelease(r *release.Release) { // Init initializes the action configuration func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namespace, helmDriver string, log DebugLog) error { - kc, err := kube.New(getter, kube.StatusWaiter) + kc, err := kube.New(getter, kube.StatusWaiterStrategy) if err != nil { return err } diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 968e1b951..daa484b69 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -91,8 +91,8 @@ type Client struct { type WaitStrategy int const ( - StatusWaiter WaitStrategy = iota - LegacyWaiter + StatusWaiterStrategy WaitStrategy = iota + LegacyWaiterStrategy ) func init() { @@ -121,13 +121,13 @@ func getStatusWatcher(factory Factory) (watcher.StatusWatcher, error) { func NewWaiter(strategy WaitStrategy, factory Factory, log func(string, ...interface{})) (Waiter, error) { switch strategy { - case LegacyWaiter: + case LegacyWaiterStrategy: kc, err := factory.KubernetesClientSet() if err != nil { return nil, err } return &HelmWaiter{kubeClient: kc, log: log}, nil - case StatusWaiter: + case StatusWaiterStrategy: sw, err := getStatusWatcher(factory) if err != nil { return nil, err diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index 3ab415a48..50fc65cef 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -513,7 +513,7 @@ func TestWait(t *testing.T) { } }), } - waiter, err := NewWaiter(LegacyWaiter, c.Factory, c.Log) + waiter, err := NewWaiter(LegacyWaiterStrategy, c.Factory, c.Log) if err != nil { t.Fatal(err) } @@ -570,7 +570,7 @@ func TestWaitJob(t *testing.T) { } }), } - waiter, err := NewWaiter(LegacyWaiter, c.Factory, c.Log) + waiter, err := NewWaiter(LegacyWaiterStrategy, c.Factory, c.Log) if err != nil { t.Fatal(err) } @@ -629,7 +629,7 @@ func TestWaitDelete(t *testing.T) { } }), } - waiter, err := NewWaiter(LegacyWaiter, c.Factory, c.Log) + waiter, err := NewWaiter(LegacyWaiterStrategy, c.Factory, c.Log) if err != nil { t.Fatal(err) } @@ -660,7 +660,7 @@ func TestWaitDelete(t *testing.T) { func TestReal(t *testing.T) { t.Skip("This is a live test, comment this line to run") - c, err := New(nil, StatusWaiter) + c, err := New(nil, StatusWaiterStrategy) if err != nil { t.Fatal(err) } @@ -673,7 +673,7 @@ func TestReal(t *testing.T) { } testSvcEndpointManifest := testServiceManifest + "\n---\n" + testEndpointManifest - c, err = New(nil, StatusWaiter) + c, err = New(nil, StatusWaiterStrategy) if err != nil { t.Fatal(err) }