Skip to content
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

Make manager proceed with deploying even with voltron route config error #3772

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make manager proceed with deploying even with voltron route config error #3772

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
12 changes: 8 additions & 4 deletions pkg/controller/manager/manager_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,9 @@ func (r *ReconcileManager) Reconcile(ctx context.Context, request reconcile.Requ
return reconcile.Result{}, err
}

routeConfig, err := getVoltronRouteConfig(ctx, r.client, helper.InstallNamespace())
if err != nil {
r.status.SetDegraded(operatorv1.InternalServerError, "Failed to create Voltron Route Configuration", err, logc)
return reconcile.Result{}, err
routeConfig, routeConfigErr := getVoltronRouteConfig(ctx, r.client, helper.InstallNamespace())
if routeConfigErr != nil {
log.Error(routeConfigErr, "error with voltron route config, continuing")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also say "route configuration will not be added to voltron"?

}

// Check if non-cluster host log ingestion is enabled.
Expand Down Expand Up @@ -725,6 +724,11 @@ func (r *ReconcileManager) Reconcile(ctx context.Context, request reconcile.Requ
}
}

if routeConfigErr != nil {
r.status.SetDegraded(operatorv1.InternalServerError, "Failed to create Voltron Route Configuration", routeConfigErr, logc)
return reconcile.Result{}, routeConfigErr
}

// Clear the degraded bit if we've reached this far.
r.status.ClearDegraded()
instance.Status.State = operatorv1.TigeraStatusReady
Expand Down
Loading