Merge pull request #102 from triggermesh/fix/add-status-reconciliatin-test

Tests: add status reconciliation to memorybroker test

Author: Pablo Mercado

pkg/reconciler/common/events.go

@@ -11,9 +11,10 @@ const (
 	ReasonFailedDeploymentCreate = "FailedDeploymentCreate"
 	ReasonFailedDeploymentUpdate = "FailedDeploymentUpdate"
 
-	ReasonFailedSecretGet    = "FailedSecretGet"
-	ReasonFailedSecretCreate = "FailedSecretCreate"
-	ReasonFailedSecretUpdate = "FailedSecretUpdate"
+	ReasonFailedSecretCompose = "FailedSecretCompose"
+	ReasonFailedSecretGet     = "FailedSecretGet"
+	ReasonFailedSecretCreate  = "FailedSecretCreate"
+	ReasonFailedSecretUpdate  = "FailedSecretUpdate"
 
 	ReasonFailedServiceAccountGet    = "FailedServiceAccountGet"
 	ReasonFailedServiceAccountCreate = "FailedServiceAccountCreate"

pkg/reconciler/common/reconcile_secret.go

@@ -57,6 +57,7 @@ func NewSecretReconciler(ctx context.Context, secretLister corev1listers.SecretL
 func (r *secretReconciler) Reconcile(ctx context.Context, rb eventingv1alpha1.ReconcilableBroker) (*corev1.Secret, error) {
 	desired, err := r.buildConfigSecret(ctx, rb)
 	if err != nil {
+		rb.GetReconcilableBrokerStatus().MarkConfigSecretFailed(ReasonFailedSecretCompose, "Failed to compose secret config from broker")
 		return nil, err
 	}
 

pkg/reconciler/memorybroker/reconciler.go

@@ -72,6 +72,10 @@ func (r *reconciler) ReconcileKind(ctx context.Context, mb *eventingv1alpha1.Mem
 }
 
 func getServiceAddress(svc *corev1.Service) *apis.URL {
+	if svc == nil || len(svc.Spec.Ports) == 0 {
+		return nil
+	}
+
 	var port string
 	if svc.Spec.Ports[0].Port != 80 {
 		port = ":" + strconv.Itoa(int(svc.Spec.Ports[0].Port))

pkg/reconciler/memorybroker/reconciler_test.go

@@ -3,14 +3,15 @@ package memorybroker
 import (
 	"context"
 	"testing"
-	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	kt "k8s.io/client-go/testing"
+
 	v1addr "knative.dev/pkg/client/injection/ducks/duck/v1/addressable"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
@@ -20,7 +21,6 @@ import (
 	fakeeventingclient "github.com/triggermesh/triggermesh-core/pkg/client/generated/injection/client/fake"
 	"github.com/triggermesh/triggermesh-core/pkg/client/generated/injection/reconciler/eventing/v1alpha1/memorybroker"
 	"github.com/triggermesh/triggermesh-core/pkg/reconciler/common"
-	"github.com/triggermesh/triggermesh-core/pkg/reconciler/resources"
 	tmt "github.com/triggermesh/triggermesh-core/pkg/reconciler/testing"
 	tmtv1alpha1 "github.com/triggermesh/triggermesh-core/pkg/reconciler/testing/v1alpha1"
 )
@@ -36,7 +36,7 @@ var (
 	tKey            = tNamespace + "/" + tName
 	tTrue           = true
 	tReplicas int32 = 1
-	tNow            = metav1.NewTime(time.Now())
+	// tNow            = metav1.NewTime(time.Now())
 )
 
 func TestAllCases(t *testing.T) {
@@ -62,19 +62,51 @@ func TestAllCases(t *testing.T) {
 				newDeploymentForBroker(tNamespace, tName),
 				newServiceForBroker(tNamespace, tName),
 			},
+			WantStatusUpdates: []kt.UpdateActionImpl{
+				{
+					Object: tmtv1alpha1.NewMemoryBroker(tNamespace, tName,
+						// tmtv1alpha1.MemoryBrokerWithStatusAddress("http://"+tName+"-mb-broker."+tNamespace+".svc.cluster.local"),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("Addressable", corev1.ConditionUnknown, "", ""),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("BrokerConfigSecretReady", corev1.ConditionTrue, "", ""),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("BrokerDeploymentReady", corev1.ConditionUnknown, "", ""),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("BrokerEndpointsReady", corev1.ConditionFalse, "UnavailableEndpoints", "Endpoints for broker service do not exist"),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("BrokerServiceAccountReady", corev1.ConditionTrue, "", ""),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("BrokerServiceReady", corev1.ConditionTrue, "", ""),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("MemoryBrokerBrokerRoleBinding", corev1.ConditionTrue, "", ""),
+						tmtv1alpha1.MemoryBrokerWithStatusCondition("Ready", corev1.ConditionFalse, "UnavailableEndpoints", "Endpoints for broker service do not exist"),
+					),
+				},
+			},
 			WantEvents: []string{
 				knt.Eventf(corev1.EventTypeWarning, "UnavailableEndpoints", `Endpoints for broker service "`+tNamespace+`/`+tName+`-mb-broker" do not exist`),
 			},
-		}, {
-			Name: "deleting broker",
-			Key:  tKey,
-			Objects: []runtime.Object{
-				tmtv1alpha1.NewMemoryBroker(tNamespace, tName,
-					tmtv1alpha1.MemoryBrokerWithMetaOptions(resources.MetaSetDeletion(&tNow))),
-			},
-			WantCreates: []runtime.Object{
-				// Reconciliation is skipped and no objects are created.
-			},
+
+			// }, {
+			// 	Name: "update status",
+			// 	Key:  tKey,
+			// 	Objects: []runtime.Object{
+			// 		tmtv1alpha1.NewMemoryBroker(tNamespace, tName),
+			// 	},
+			// 	WantCreates: []runtime.Object{
+			// 		newSecretForBroker(tNamespace, tName),
+			// 		newServiceAccountForBroker(tNamespace, tName),
+			// 		newRoleBindingForBroker(tNamespace, tName),
+			// 		newDeploymentForBroker(tNamespace, tName),
+			// 		newServiceForBroker(tNamespace, tName),
+			// 	},
+			// 	WantEvents: []string{
+			// 		knt.Eventf(corev1.EventTypeWarning, "UnavailableEndpoints", `Endpoints for broker service "`+tNamespace+`/`+tName+`-mb-broker" do not exist`),
+			// 	},
+			// }, {
+			// 	Name: "deleting broker",
+			// 	Key:  tKey,
+			// 	Objects: []runtime.Object{
+			// 		tmtv1alpha1.NewMemoryBroker(tNamespace, tName,
+			// 			tmtv1alpha1.MemoryBrokerWithMetaOptions(resources.MetaSetDeletion(&tNow))),
+			// 	},
+			// 	WantCreates: []runtime.Object{
+			// 		// Reconciliation is skipped and no objects are created.
+			// 	},
 		},
 	}
 
@@ -102,7 +134,7 @@ func TestAllCases(t *testing.T) {
 			listers.GetMemoryBrokerLister(),
 			controller.GetEventRecorder(ctx),
 			r,
-			controller.Options{SkipStatusUpdates: true})
+			controller.Options{SkipStatusUpdates: false})
 	}, false, logger))
 }
 

pkg/reconciler/testing/v1alpha1/memorybroker.go

@@ -1,8 +1,11 @@
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	knapis "knative.dev/pkg/apis"
+
 	eventingv1alpha1 "github.com/triggermesh/triggermesh-core/pkg/apis/eventing/v1alpha1"
 	"github.com/triggermesh/triggermesh-core/pkg/reconciler/resources"
 )
@@ -34,3 +37,28 @@ func MemoryBrokerWithMetaOptions(opts ...resources.MetaOption) MemoryBrokerOptio
 		}
 	}
 }
+
+func MemoryBrokerWithStatusAddress(url string) MemoryBrokerOption {
+	return func(d *eventingv1alpha1.MemoryBroker) {
+
+		pu, err := knapis.ParseURL(url)
+		if err != nil {
+			panic(err)
+		}
+		d.Status.Address.URL = pu
+	}
+}
+
+func MemoryBrokerWithStatusCondition(typ string, status corev1.ConditionStatus, reason, msg string) MemoryBrokerOption {
+	return func(d *eventingv1alpha1.MemoryBroker) {
+
+		d.Status.Conditions = append(d.Status.Conditions,
+			knapis.Condition{
+				Type:    knapis.ConditionType(typ),
+				Status:  status,
+				Reason:  reason,
+				Message: msg,
+			},
+		)
+	}
+}