diff --git a/pkg/kube/kwait.go b/pkg/kube/kwait.go index d0dcc9b60..f173a074e 100644 --- a/pkg/kube/kwait.go +++ b/pkg/kube/kwait.go @@ -50,6 +50,12 @@ func (w *kstatusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Dur return w.wait(ctx, resourceList, true) } +func (w *kstatusWaiter) waitForDelete(ctx context.Context, resourceList ResourceList) error { + _, cancel := context.WithCancel(ctx) + defer cancel() + return nil +} + func (w *kstatusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error { cancelCtx, cancel := context.WithCancel(ctx) defer cancel() diff --git a/pkg/kube/kwait_test.go b/pkg/kube/kwait_test.go index 527d10a05..2301c373d 100644 --- a/pkg/kube/kwait_test.go +++ b/pkg/kube/kwait_test.go @@ -29,6 +29,7 @@ import ( batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -116,6 +117,59 @@ func getGVR(t *testing.T, mapper meta.RESTMapper, obj *unstructured.Unstructured return mapping.Resource } +func TestKWaitForDelete(t *testing.T) { + t.Parallel() + tests := []struct { + name string + objs []runtime.Object + expectErrs []error + waitForJobs bool + pausedAsReady bool + }{ + { + name: "Pod is deleted", + objs: []runtime.Object{ + &v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod", Namespace: "ns"}}, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + c := newTestClient(t) + fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme) + fakeMapper := testutil.NewFakeRESTMapper( + v1.SchemeGroupVersion.WithKind("Pod"), + appsv1.SchemeGroupVersion.WithKind("Deployment"), + batchv1.SchemeGroupVersion.WithKind("Job"), + ) + statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper) + kwaiter := kstatusWaiter{ + sw: statusWatcher, + log: log.Printf, + } + ctx, cancel := context.WithTimeout(context.Background(), time.Second*3) + defer cancel() + resourceList := ResourceList{} + for _, obj := range tt.objs { + list, err := c.Build(objBody(obj), false) + assert.NoError(t, err) + // gvr := getGVR(t, fakeMapper, obj.) + // err = fakeClient.Tracker().Create(gvr, obj, ) + // assert.NoError(t, err) + // resourceList = append(resourceList, list...) + } + err := kwaiter.waitForDelete(ctx, resourceList) + if tt.expectErrs != nil { + assert.EqualError(t, err, errors.Join(tt.expectErrs...).Error()) + return + } + assert.NoError(t, err) + }) + } + +} + func TestKWaitJob(t *testing.T) { t.Parallel() tests := []struct {