Fix namespace setting with direct applier

The direct-applier was not setting the namespace correctly; we reuse
the SetNamespace visitor to do so.

Author: justinsb

pkg/patterns/declarative/pkg/applier/direct.go

@@ -2,12 +2,16 @@ package applier
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/rest"
 	"k8s.io/kubectl/pkg/cmd/apply"
 	cmdDelete "k8s.io/kubectl/pkg/cmd/delete"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
@@ -22,6 +26,8 @@ func NewDirectApplier() *DirectApplier {
 }
 
 func (d *DirectApplier) Apply(ctx context.Context,
+	restConfig *rest.Config,
+	restMapper meta.RESTMapper,
 	namespace string,
 	manifest string,
 	validate bool,
@@ -32,16 +38,29 @@ func (d *DirectApplier) Apply(ctx context.Context,
 		Out:    os.Stdout,
 		ErrOut: os.Stderr,
 	}
-	restClient := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
 	ioReader := strings.NewReader(manifest)
 
-	b := resource.NewBuilder(restClient)
+	restClientGetter := &staticRESTClientGetter{
+		RESTMapper: restMapper,
+		RESTConfig: restConfig,
+	}
+	b := resource.NewBuilder(restClientGetter)
 	res := b.Unstructured().Stream(ioReader, "manifestString").Do()
 	infos, err := res.Infos()
 	if err != nil {
 		return err
 	}
 
+	// Populate the namespace on any namespace-scoped objects
+	if namespace != "" {
+		visitor := resource.SetNamespace(namespace)
+		for _, info := range infos {
+			if err := info.Visit(visitor); err != nil {
+				return fmt.Errorf("error from SetNamespace: %w", err)
+			}
+		}
+	}
+
 	applyOpts := apply.NewApplyOptions(ioStreams)
 	applyOpts.Namespace = namespace
 	applyOpts.SetObjects(infos)
@@ -56,3 +75,31 @@ func (d *DirectApplier) Apply(ctx context.Context,
 
 	return applyOpts.Run()
 }
+
+// staticRESTClientGetter returns a fixed RESTClient
+type staticRESTClientGetter struct {
+	RESTConfig      *rest.Config
+	DiscoveryClient discovery.CachedDiscoveryInterface
+	RESTMapper      meta.RESTMapper
+}
+
+var _ resource.RESTClientGetter = &staticRESTClientGetter{}
+
+func (s *staticRESTClientGetter) ToRESTConfig() (*rest.Config, error) {
+	if s.RESTConfig == nil {
+		return nil, fmt.Errorf("RESTConfig not set")
+	}
+	return s.RESTConfig, nil
+}
+func (s *staticRESTClientGetter) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
+	if s.DiscoveryClient == nil {
+		return nil, fmt.Errorf("DiscoveryClient not set")
+	}
+	return s.DiscoveryClient, nil
+}
+func (s *staticRESTClientGetter) ToRESTMapper() (meta.RESTMapper, error) {
+	if s.RESTMapper == nil {
+		return nil, fmt.Errorf("RESTMapper not set")
+	}
+	return s.RESTMapper, nil
+}

pkg/patterns/declarative/pkg/applier/exec.go

@@ -24,6 +24,8 @@ import (
 	"strconv"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -49,7 +51,7 @@ func (console) Run(c *exec.Cmd) error {
 }
 
 // Apply runs the kubectl apply with the provided manifest argument
-func (c *ExecKubectl) Apply(ctx context.Context, namespace string, manifest string, validate bool,
+func (c *ExecKubectl) Apply(ctx context.Context, restConfig *rest.Config, restMapper meta.RESTMapper, namespace string, manifest string, validate bool,
 	extraArgs ...string) error {
 	log := log.Log
 

pkg/patterns/declarative/pkg/applier/exec_test.go

@@ -85,7 +85,7 @@ func TestKubectlApply(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			cs := collector{Error: test.err}
 			kubectl := &ExecKubectl{cmdSite: &cs}
-			err := kubectl.Apply(context.Background(), test.namespace, test.manifest, test.validate, test.args...)
+			err := kubectl.Apply(context.Background(), nil, nil, test.namespace, test.manifest, test.validate, test.args...)
 
 			if test.err != nil && err == nil {
 				t.Error("expected error to occur")

pkg/patterns/declarative/pkg/applier/type.go

@@ -2,8 +2,11 @@ package applier
 
 import (
 	"context"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/client-go/rest"
 )
 
 type Applier interface {
-	Apply(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error
+	Apply(ctx context.Context, restConfig *rest.Config, restMapper meta.RESTMapper, namespace string, manifest string, validate bool, extraArgs ...string) error
 }

pkg/patterns/declarative/reconciler.go

@@ -256,7 +256,7 @@ func (r *Reconciler) reconcileExists(ctx context.Context, name types.NamespacedN
 		}
 	}
 
-	if err := r.kubectl.Apply(ctx, ns, manifestStr, r.options.validate, extraArgs...); err != nil {
+	if err := r.kubectl.Apply(ctx, r.config, r.restMapper, ns, manifestStr, r.options.validate, extraArgs...); err != nil {
 		log.Error(err, "applying manifest")
 		return reconcile.Result{}, fmt.Errorf("error applying manifest: %v", err)
 	}
@@ -564,14 +564,13 @@ func (r *Reconciler) CollectMetrics() bool {
 	return r.options.metrics
 }
 
-func GetObjectFromCluster(obj *manifest.Object, r *Reconciler) (*unstructured.
-	Unstructured, error) {
+func GetObjectFromCluster(obj *manifest.Object, r *Reconciler) (*unstructured.Unstructured, error) {
 	getOptions := metav1.GetOptions{}
 	gvk := obj.GroupVersionKind()
 
 	mapping, err := r.restMapper.RESTMapping(obj.GroupKind(), gvk.Version)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get mapping for resource: %w", err)
+		return nil, fmt.Errorf("unable to get mapping for resource %v: %w", gvk, err)
 	}
 	ns := obj.UnstructuredObject().GetNamespace()
 	unstruct, err := r.dynamicClient.Resource(mapping.Resource).Namespace(ns).Get(context.Background(),