From 21cd224c0d63989246e446759ef96d6d4c6cd71c Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Fri, 24 May 2019 09:56:28 +0100
Subject: [PATCH] fix: Integration stuck waiting for platform

fixes #660
---
 .../integration/integration_controller.go     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go
index a9161b2376..e3c6ba9450 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -6,7 +6,9 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 
+	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -17,6 +19,7 @@ import (
 
 	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 	"github.com/apache/camel-k/pkg/client"
+	"github.com/apache/camel-k/pkg/util/log"
 )
 
 /**
@@ -90,6 +93,40 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 		return err
 	}
 
+	// Watch for IntegrationPlatform phase transitioning to ready
+	// and enqueue requests for any integrations that are in phase waiting for platform
+	err = c.Watch(&source.Kind{Type: &v1alpha1.IntegrationPlatform{}}, &handler.EnqueueRequestsFromMapFunc{
+		ToRequests: handler.ToRequestsFunc(func(a handler.MapObject) []reconcile.Request {
+			platform := a.Object.(*v1alpha1.IntegrationPlatform)
+			requests := []reconcile.Request{}
+
+			if platform.Status.Phase == v1alpha1.IntegrationPlatformPhaseReady {
+				list := &v1alpha1.IntegrationList{}
+
+				if err := mgr.GetClient().List(context.TODO(), &k8sclient.ListOptions{Namespace: platform.Namespace}, list); err != nil {
+					log.Error(err, "Failed to retrieve integration list")
+					return requests
+				}
+
+				for _, integration := range list.Items {
+					if integration.Status.Phase == v1alpha1.IntegrationPhaseWaitingForPlatform {
+						requests = append(requests, reconcile.Request{
+							NamespacedName: types.NamespacedName{
+								Namespace: integration.Namespace,
+								Name:      integration.Name,
+							},
+						})
+					}
+				}
+			}
+
+			return requests
+		}),
+	})
+	if err != nil {
+		return err
+	}
+
 	return nil
 }