Merge pull request #47 from joelanford/bugfix/reconciliation

pkg/helm,pkg/helm/controller: fixing reconciliation loop bugs

Author: joelanford

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

@@ -42,7 +42,7 @@ func (r helmOperatorReconciler) Reconcile(request reconcile.Request) (reconcile.
 
 	if o.GetResourceVersion() == lastResourceVersion {
 		logrus.Infof("skipping %s because resource version has not changed", request.NamespacedName)
-		return reconcile.Result{}, nil
+		return reconcile.Result{RequeueAfter: r.ResyncPeriod}, nil
 	}
 
 	updatedResource, err := r.Installer.InstallRelease(o)

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

@@ -162,8 +162,20 @@ func (c installer) InstallRelease(r *v1alpha1.HelmApp) (*v1alpha1.HelmApp, error
 // UninstallRelease accepts a custom resource, uninstalls the existing Helm release
 // using Tiller, and returns the custom resource with updated `status`.
 func (c installer) UninstallRelease(r *v1alpha1.HelmApp) (*v1alpha1.HelmApp, error) {
+	// Get history of this release
+	h, err := c.storageBackend.History(releaseName(r))
+	if err != nil {
+		return r, err
+	}
+
+	// If there is no history, the release has already been uninstalled,
+	// so there's nothing to do.
+	if len(h) == 0 {
+		return r, nil
+	}
+
 	tiller := tillerRendererForCR(r, c.storageBackend, c.tillerKubeClient)
-	_, err := tiller.UninstallRelease(context.TODO(), &services.UninstallReleaseRequest{
+	_, err = tiller.UninstallRelease(context.TODO(), &services.UninstallReleaseRequest{
 		Name:  releaseName(r),
 		Purge: true,
 	})