pkg/helm: inject owner reference via client

Author: joelanford

pkg/helm/release/manager.go

@@ -59,7 +59,7 @@ type Manager interface {
 type manager struct {
 	actionConfig   *action.Configuration
 	storageBackend *storage.Storage
-	kubeClient     *kube.Client
+	kubeClient     kube.Interface
 
 	releaseName string
 	namespace   string
@@ -216,7 +216,7 @@ func (m manager) ReconcileRelease(ctx context.Context) (*rpb.Release, error) {
 	return m.deployedRelease, err
 }
 
-func reconcileRelease(ctx context.Context, kubeClient *kube.Client, namespace string, expectedManifest string) error {
+func reconcileRelease(ctx context.Context, kubeClient kube.Interface, namespace string, expectedManifest string) error {
 	expectedInfos, err := kubeClient.Build(bytes.NewBufferString(expectedManifest), false)
 	if err != nil {
 		return err

pkg/helm/release/manager_factory.go

@@ -16,8 +16,13 @@ package release
 
 import (
 	"fmt"
+	"io"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"k8s.io/apimachinery/pkg/api/meta"
+
 	"github.com/martinlindhe/base36"
 	"github.com/pborman/uuid"
 	"helm.sh/helm/v3/pkg/action"
@@ -26,8 +31,10 @@ import (
 	helmrelease "helm.sh/helm/v3/pkg/release"
 	"helm.sh/helm/v3/pkg/storage"
 	"helm.sh/helm/v3/pkg/storage/driver"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	apitypes "k8s.io/apimachinery/pkg/types"
+	"k8s.io/cli-runtime/pkg/resource"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	crmanager "sigs.k8s.io/controller-runtime/pkg/manager"
 
@@ -76,16 +83,21 @@ func (f managerFactory) NewManager(cr *unstructured.Unstructured) (Manager, erro
 	if !ok {
 		return nil, fmt.Errorf("failed to get spec: expected map[string]interface{}")
 	}
+	controllerRef := metav1.NewControllerRef(cr, cr.GroupVersionKind())
+	ownerRefClient := &ownerRefInjectingClient{
+		refs:   []metav1.OwnerReference{*controllerRef},
+		Client: *kubeClient,
+	}
 	actionConfig := &action.Configuration{
 		RESTClientGetter: rcg,
 		Releases:         storageBackend,
-		KubeClient:       kubeClient,
+		KubeClient:       ownerRefClient,
 		Log:              func(_ string, _ ...interface{}) {},
 	}
 	return &manager{
 		actionConfig:   actionConfig,
 		storageBackend: storageBackend,
-		kubeClient:     kubeClient,
+		kubeClient:     ownerRefClient,
 
 		releaseName: releaseName,
 		namespace:   cr.GetNamespace(),
@@ -96,6 +108,36 @@ func (f managerFactory) NewManager(cr *unstructured.Unstructured) (Manager, erro
 	}, nil
 }
 
+type ownerRefInjectingClient struct {
+	refs []metav1.OwnerReference
+	kube.Client
+}
+
+func (c *ownerRefInjectingClient) Build(reader io.Reader, validate bool) (kube.ResourceList, error) {
+	resourceList, err := c.Client.Build(reader, validate)
+	if err != nil {
+		return resourceList, err
+	}
+	err = resourceList.Visit(func(r *resource.Info, err error) error {
+		if err != nil {
+			return err
+		}
+		objMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(r.Object)
+		if err != nil {
+			return err
+		}
+		u := &unstructured.Unstructured{Object: objMap}
+		if r.ResourceMapping().Scope == meta.RESTScopeNamespace {
+			u.SetOwnerReferences(c.refs)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return resourceList, nil
+}
+
 // getReleaseName returns a release name for the CR. If a release for the
 // legacy name exists, the legacy name is returned. This ensures
 // backwards-compatibility for pre-existing CRs.