Skip to content

Mark the Broker's Ingress and Filter status condidionts failed when they have failed. #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Harwayne merged 1 commit into from
Mar 18, 2019
Merged

Mark the Broker's Ingress and Filter status condidionts failed when they have failed. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/apis/eventing/v1alpha1/broker_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ func (bs *BrokerStatus) MarkFilterReady() {
brokerCondSet.Manage(bs).MarkTrue(BrokerConditionFilter)
}

func (bs *BrokerStatus) MarkFilterFailed(err error) {
brokerCondSet.Manage(bs).MarkFalse(BrokerConditionFilter, "failed", "%v", err)
}

// SetAddress makes this Broker addressable by setting the hostname. It also
// sets the BrokerConditionAddressable to true.
func (bs *BrokerStatus) SetAddress(hostname string) {
Expand Down
4 changes: 4 additions & 0 deletions pkg/reconciler/v1alpha1/broker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,24 +189,28 @@ func (r *reconciler) reconcile(ctx context.Context, b *v1alpha1.Broker) (reconci
_, err = r.reconcileFilterDeployment(ctx, b)
if err != nil {
logging.FromContext(ctx).Error("Problem reconciling filter Deployment", zap.Error(err))
b.Status.MarkFilterFailed(err)
return reconcile.Result{}, err
}
_, err = r.reconcileFilterService(ctx, b)
if err != nil {
logging.FromContext(ctx).Error("Problem reconciling filter Service", zap.Error(err))
b.Status.MarkFilterFailed(err)
return reconcile.Result{}, err
}
b.Status.MarkFilterReady()

_, err = r.reconcileIngressDeployment(ctx, b, c)
if err != nil {
logging.FromContext(ctx).Error("Problem reconciling ingress Deployment", zap.Error(err))
b.Status.MarkIngressFailed(err)
return reconcile.Result{}, err
}

svc, err := r.reconcileIngressService(ctx, b)
if err != nil {
logging.FromContext(ctx).Error("Problem reconciling ingress Service", zap.Error(err))
b.Status.MarkIngressFailed(err)
return reconcile.Result{}, err
}
b.Status.MarkIngressReady()
Expand Down