From f3a8e56929f57532bac8c335ed2bc63048eb93c1 Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Sun, 29 Dec 2024 14:37:33 +0000 Subject: [PATCH] change structure of client Signed-off-by: Austin Abro --- pkg/kube/interface.go | 6 +++++- pkg/kube/kwait_test.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/kube/interface.go b/pkg/kube/interface.go index 1301bf463..4f24444bd 100644 --- a/pkg/kube/interface.go +++ b/pkg/kube/interface.go @@ -29,6 +29,11 @@ import ( // // A KubernetesClient must be concurrency safe. type Interface interface { + ResourceManager + Waiter +} + +type ResourceManager interface { // Create creates one or more resources. Create(resources ResourceList, options ...ClientCreateOption) (*Result, error) @@ -67,7 +72,6 @@ type Waiter interface { // Update updates one or more resources or creates the resource // if it doesn't exist. Update(original, target ResourceList, force bool) (*Result, error) - // WatchUntilReady watches the resources given and waits until it is ready. // // This method is mainly for hook implementations. It watches for a resource to diff --git a/pkg/kube/kwait_test.go b/pkg/kube/kwait_test.go index 1d9a69959..77c469212 100644 --- a/pkg/kube/kwait_test.go +++ b/pkg/kube/kwait_test.go @@ -98,7 +98,7 @@ func TestRunHealthChecks(t *testing.T) { err = fakeClient.Tracker().Create(podGVR, pod, pod.GetNamespace()) require.NoError(t, err) } - c.waiter = &kstatusWaiter{ + c.Waiter = &kstatusWaiter{ sw: statusWatcher, log: c.Log, }