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

status wait

Browse source 
Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
This commit is contained in:
Austin Abro 2025-01-05 15:11:05 +00:00
parent 4dd6e19b1d
commit cb6d48e6ae
No known key found for this signature in database
GPG key ID: 92EB5159E403F9D6
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/kube/client.go
View file

@ -123,7 +123,7 @@ func New(getter genericclioptions.RESTClientGetter, waiter Waiter) (*Client, err
if err != nil {
return nil, err
}
waiter = &kstatusWaiter{
waiter = &statusWaiter{
sw: sw,
log: nopLogger,
}

10
pkg/kube/kwait.go → pkg/kube/statuswait.go
View file

@ -33,24 +33,24 @@ import (
"sigs.k8s.io/cli-utils/pkg/object"
)
type kstatusWaiter struct {
type statusWaiter struct {
sw watcher.StatusWatcher
log func(string, ...interface{})
}
func (w *kstatusWaiter) Wait(resourceList ResourceList, timeout time.Duration) error {
func (w *statusWaiter) Wait(resourceList ResourceList, timeout time.Duration) error {
ctx, cancel := context.WithTimeout(context.TODO(), timeout)
defer cancel()
return w.wait(ctx, resourceList, false)
}
func (w *kstatusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Duration) error {
func (w *statusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Duration) error {
ctx, cancel := context.WithTimeout(context.TODO(), timeout)
defer cancel()
return w.wait(ctx, resourceList, true)
}
func (w *kstatusWaiter) waitForDelete(ctx context.Context, resourceList ResourceList) error {
func (w *statusWaiter) waitForDelete(ctx context.Context, resourceList ResourceList) error {
cancelCtx, cancel := context.WithCancel(ctx)
defer cancel()
runtimeObjs := []runtime.Object{}
@ -109,7 +109,7 @@ func (w *kstatusWaiter) waitForDelete(ctx context.Context, resourceList Resource
return nil
}
func (w *kstatusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error {
func (w *statusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error {
cancelCtx, cancel := context.WithCancel(ctx)
defer cancel()
runtimeObjs := []runtime.Object{}

12
pkg/kube/kwait_test.go → pkg/kube/statuswait_test.go
View file

@ -116,7 +116,7 @@ func getGVR(t *testing.T, mapper meta.RESTMapper, obj *unstructured.Unstructured
return mapping.Resource
}
func TestKWaitForDelete(t *testing.T) {
func TestStatusWaitForDelete(t *testing.T) {
t.Parallel()
tests := []struct {
name string
@ -132,7 +132,7 @@ func TestKWaitForDelete(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// t.Parallel()
t.Parallel()
c := newTestClient(t)
fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme)
fakeMapper := testutil.NewFakeRESTMapper(
@ -141,7 +141,7 @@ func TestKWaitForDelete(t *testing.T) {
batchv1.SchemeGroupVersion.WithKind("Job"),
)
statusWatcher := watcher.NewDefaultStatusWatcher(fakeClient, fakeMapper)
kwaiter := kstatusWaiter{
kwaiter := statusWaiter{
sw: statusWatcher,
log: log.Printf,
}
@ -180,7 +180,7 @@ func TestKWaitForDelete(t *testing.T) {
}
func TestKWait(t *testing.T) {
func TestStatusWait(t *testing.T) {
t.Parallel()
tests := []struct {
name string
@ -224,7 +224,7 @@ func TestKWait(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// t.Parallel()
t.Parallel()
c := newTestClient(t)
fakeClient := dynamicfake.NewSimpleDynamicClient(scheme.Scheme)
fakeMapper := testutil.NewFakeRESTMapper(
@ -244,7 +244,7 @@ func TestKWait(t *testing.T) {
err = fakeClient.Tracker().Create(gvr, resource, resource.GetNamespace())
assert.NoError(t, err)
}
kwaiter := kstatusWaiter{
kwaiter := statusWaiter{
sw: statusWatcher,
log: log.Printf,
}