Merge pull request #48 from joelanford/multiple-resources

Support multiple resources

Author: joelanford

helm-app-operator/Gopkg.lock

@@ -55,19 +55,20 @@ func main() {
 		logrus.Fatal(err)
 	}
 
-	// Dynamically load the helm installer based on the environment
-	gvk, installer, err := helm.NewInstallerFromEnv(storageBackend, tillerKubeClient)
+	installers, err := helm.NewInstallersFromEnv(storageBackend, tillerKubeClient)
 	if err != nil {
 		logrus.Fatal(err)
 	}
 
-	// Register the controller with the manager.
-	controller.Add(mgr, controller.WatchOptions{
-		Namespace:    namespace,
-		GVK:          gvk,
-		Installer:    installer,
-		ResyncPeriod: 5 * time.Second,
-	})
+	for gvk, installer := range installers {
+		// Register the controller with the manager.
+		controller.Add(mgr, controller.WatchOptions{
+			Namespace:    namespace,
+			GVK:          gvk,
+			Installer:    installer,
+			ResyncPeriod: 5 * time.Second,
+		})
+	}
 
 	logrus.Print("Starting the Cmd.")
 

helm-app-operator/cmd/manager/main.go

@@ -7,13 +7,14 @@ import (
 
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	crthandler "sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	appv1alpha1 "github.com/operator-framework/helm-app-operator-kit/helm-app-operator/pkg/apis/app/v1alpha1"
 	"github.com/operator-framework/helm-app-operator-kit/helm-app-operator/pkg/helm"
 )
 
@@ -32,15 +33,15 @@ func Add(mgr manager.Manager, options WatchOptions) {
 		options.ResyncPeriod = time.Minute
 	}
 	r := &helmOperatorReconciler{
-		Client:       mgr.GetClient(),
-		GVK:          options.GVK,
-		Installer:    options.Installer,
-		ResyncPeriod: options.ResyncPeriod,
+		Client:               mgr.GetClient(),
+		GVK:                  options.GVK,
+		Installer:            options.Installer,
+		ResyncPeriod:         options.ResyncPeriod,
+		lastResourceVersions: map[types.NamespacedName]string{},
 	}
 
 	// Register the GVK with the schema
-	mgr.GetScheme().AddKnownTypeWithName(options.GVK, &appv1alpha1.HelmApp{})
-	mgr.GetScheme().AddKnownTypeWithName(options.GVK.GroupVersion().WithKind(options.GVK.Kind+"List"), &appv1alpha1.HelmAppList{})
+	mgr.GetScheme().AddKnownTypeWithName(options.GVK, &unstructured.Unstructured{})
 	metav1.AddToGroupVersion(mgr.GetScheme(), options.GVK.GroupVersion())
 
 	controllerName := fmt.Sprintf("%v-controller", strings.ToLower(options.GVK.Kind))
@@ -49,7 +50,8 @@ func Add(mgr manager.Manager, options WatchOptions) {
 		logrus.Fatal(err)
 	}
 
-	o := &appv1alpha1.HelmApp{}
+	o := &unstructured.Unstructured{}
+	o.SetGroupVersionKind(options.GVK)
 	if err := c.Watch(&source.Kind{Type: o}, &crthandler.EnqueueRequestForObject{}); err != nil {
 		logrus.Fatal(err)
 	}

helm-app-operator/pkg/helm/controller/controller.go

@@ -3,16 +3,18 @@ package controller
 import (
 	"context"
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/sirupsen/logrus"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	appv1alpha1 "github.com/operator-framework/helm-app-operator-kit/helm-app-operator/pkg/apis/app/v1alpha1"
 	"github.com/operator-framework/helm-app-operator-kit/helm-app-operator/pkg/helm"
 )
 
@@ -21,26 +23,61 @@ type helmOperatorReconciler struct {
 	GVK          schema.GroupVersionKind
 	Installer    helm.Installer
 	ResyncPeriod time.Duration
+
+	lastResourceVersions map[types.NamespacedName]string
+	mutex                sync.RWMutex
 }
 
-var lastResourceVersion string
+const (
+	finalizer = "uninstall-helm-release"
+)
 
-func (r helmOperatorReconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) {
+func (r *helmOperatorReconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) {
 	logrus.Infof("processing %s", request.NamespacedName)
 
-	o := &appv1alpha1.HelmApp{}
-	err := r.Client.Get(context.TODO(), request.NamespacedName, o)
+	o := &unstructured.Unstructured{}
 	o.SetGroupVersionKind(r.GVK)
-	o.SetNamespace(request.Namespace)
-	o.SetName(request.Name)
+	err := r.Client.Get(context.TODO(), request.NamespacedName, o)
+	if apierrors.IsNotFound(err) {
+		return reconcile.Result{}, nil
+	}
 	if err != nil {
-		if apierrors.IsNotFound(err) {
-			_, err = r.Installer.UninstallRelease(o)
+		return reconcile.Result{}, err
+	}
+
+	deleted := o.GetDeletionTimestamp() != nil
+	pendingFinalizers := o.GetFinalizers()
+	if !deleted && !contains(pendingFinalizers, finalizer) {
+		logrus.Debugf("adding finalizer %s to resource", finalizer)
+		finalizers := append(pendingFinalizers, finalizer)
+		o.SetFinalizers(finalizers)
+		err := r.Client.Update(context.TODO(), o)
+		return reconcile.Result{}, err
+	}
+	if deleted {
+		if !contains(pendingFinalizers, finalizer) {
+			logrus.Info("resouce is terminated, skipping reconciliation")
+			return reconcile.Result{}, nil
+		}
+
+		_, err = r.Installer.UninstallRelease(o)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+
+		finalizers := []string{}
+		for _, pendingFinalizer := range pendingFinalizers {
+			if pendingFinalizer != finalizer {
+				finalizers = append(finalizers, pendingFinalizer)
+			}
 		}
+		o.SetFinalizers(finalizers)
+		err := r.Client.Update(context.TODO(), o)
 		return reconcile.Result{}, err
 	}
 
-	if o.GetResourceVersion() == lastResourceVersion {
+	lastResourceVersion, ok := r.getLastResourceVersion(request.NamespacedName)
+	if ok && o.GetResourceVersion() == lastResourceVersion {
 		logrus.Infof("skipping %s because resource version has not changed", request.NamespacedName)
 		return reconcile.Result{RequeueAfter: r.ResyncPeriod}, nil
 	}
@@ -56,7 +93,29 @@ func (r helmOperatorReconciler) Reconcile(request reconcile.Request) (reconcile.
 		logrus.Errorf(err.Error())
 		return reconcile.Result{}, fmt.Errorf("failed to update custom resource status: %v", err)
 	}
-	lastResourceVersion = o.GetResourceVersion()
+	r.setLastResourceVersion(request.NamespacedName, o.GetResourceVersion())
 
 	return reconcile.Result{RequeueAfter: r.ResyncPeriod}, nil
 }
+
+func contains(l []string, s string) bool {
+	for _, elem := range l {
+		if elem == s {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *helmOperatorReconciler) getLastResourceVersion(n types.NamespacedName) (string, bool) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+	v, ok := r.lastResourceVersions[n]
+	return v, ok
+}
+
+func (r *helmOperatorReconciler) setLastResourceVersion(n types.NamespacedName, v string) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	r.lastResourceVersions[n] = v
+}