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

Jump to bottom

Automated cherry pick of #3417: Fix missing error message in tigerastatus object. #3421

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Automated cherry pick of #3417: Fix missing error message in tigerastatus object. #3421

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
3 changes: 2 additions & 1 deletion pkg/controller/logstorage/elastic/elastic_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/elastic/cloud-on-k8s/v2/pkg/utils/stringsutil"
"github.com/go-logr/logr"
v3 "github.com/tigera/api/pkg/apis/projectcalico/v3"

operatorv1 "github.com/tigera/operator/api/v1"
"github.com/tigera/operator/pkg/common"
"github.com/tigera/operator/pkg/controller/certificatemanager"
Expand Down Expand Up @@ -571,7 +572,7 @@ func (r *ElasticSubController) Reconcile(ctx context.Context, request reconcile.
// In multi-tenant mode, ILM programming is created out of band
if !r.multiTenant {
if err := r.applyILMPolicies(ls, reqLogger, ctx); err != nil {
r.status.SetDegraded(operatorv1.ResourceNotReady, "Error applying ILM policies", nil, reqLogger)
r.status.SetDegraded(operatorv1.ResourceNotReady, "Error applying ILM policies", err, reqLogger)
return reconcile.Result{}, err
}
}
Expand Down