feat: add NewClusterAwareClientWithWatch convinience wrapper to kcp package

Signed-off-by: aaronschweig <[email protected]>

Author: aaronschweig

pkg/kcp/wrappers.go

@@ -127,17 +127,27 @@ func NewClusterAwareAPIReader(config *rest.Config, opts client.Options) (client.
 //		...
 //	}
 func NewClusterAwareClient(config *rest.Config, opts client.Options) (client.Client, error) {
+	opts, err := applyClientOptions(config, opts)
+	if err != nil {
+		return nil, err
+	}
+
+	return client.New(config, opts)
+}
+
+func applyClientOptions(config *rest.Config, opts client.Options) (client.Options, error) {
 	if opts.HTTPClient == nil {
 		httpClient, err := NewClusterAwareHTTPClient(config)
 		if err != nil {
-			return nil, err
+			return opts, err
 		}
 		opts.HTTPClient = httpClient
 	}
 	if opts.Mapper == nil && opts.MapperWithContext == nil {
 		opts.MapperWithContext = NewClusterAwareMapperProvider(config, opts.HTTPClient)
 	}
-	return client.New(config, opts)
+
+	return opts, nil
 }
 
 // NewClusterAwareHTTPClient returns an http.Client with a cluster aware round tripper.
@@ -151,6 +161,15 @@ func NewClusterAwareHTTPClient(config *rest.Config) (*http.Client, error) {
 	return httpClient, nil
 }
 
+func NewClusterAwareClientWithWatch(config *rest.Config, options client.Options) (client.WithWatch, error) {
+	opts, err := applyClientOptions(config, options)
+	if err != nil {
+		return nil, err
+	}
+
+	return client.NewWithWatch(config, opts)
+}
+
 // NewClusterAwareMapperProvider returns a function producing RESTMapper for the
 // cluster specified in the context.
 func NewClusterAwareMapperProvider(c *rest.Config, httpClient *http.Client) func(ctx context.Context) (meta.RESTMapper, error) {