paused as ready

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
pull/13604/head
Austin Abro 9 months ago
parent e18f22071d
commit b337790c10
No known key found for this signature in database
GPG Key ID: 92EB5159E403F9D6

@ -52,7 +52,6 @@ func (w *kstatusWaiter) wait(resourceList ResourceList, timeout time.Duration, w
defer cancel() defer cancel()
cancelCtx, cancel := context.WithCancel(ctx) cancelCtx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
// TODO maybe a simpler way to transfer the objects
runtimeObjs := []runtime.Object{} runtimeObjs := []runtime.Object{}
for _, resource := range resourceList { for _, resource := range resourceList {
switch value := AsVersioned(resource).(type) { switch value := AsVersioned(resource).(type) {

@ -18,13 +18,14 @@ package kube // import "helm.sh/helm/v3/pkg/kube"
import ( import (
"errors" "errors"
"log"
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
batchv1 "k8s.io/api/batch/v1"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@ -166,7 +167,7 @@ func TestKWaitJob(t *testing.T) {
fakeMapper := testutil.NewFakeRESTMapper( fakeMapper := testutil.NewFakeRESTMapper(
v1.SchemeGroupVersion.WithKind("Pod"), v1.SchemeGroupVersion.WithKind("Pod"),
appsv1.SchemeGroupVersion.WithKind("Deployment"), appsv1.SchemeGroupVersion.WithKind("Deployment"),
batchv1.SchemeGroupVersion.WithKind("Job"), batchv1.SchemeGroupVersion.WithKind("Job"),
) )
objs := []runtime.Object{} objs := []runtime.Object{}
statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper) statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper)
@ -181,9 +182,9 @@ func TestKWaitJob(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
} }
kwaiter := kstatusWaiter{ kwaiter := kstatusWaiter{
sw: statusWatcher, sw: statusWatcher,
log: c.Log, log: log.Printf,
pausedAsReady: tt.pausedAsReady, pausedAsReady: tt.pausedAsReady,
} }
resourceList := ResourceList{} resourceList := ResourceList{}

Loading…
Cancel
Save