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.

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

Report TigeraStatus for tiers #3130

Merged
merged 4 commits into from
Jan 18, 2024
Merged

Report TigeraStatus for tiers #3130

merged 4 commits into from
Jan 18, 2024

Conversation

pasanw
Copy link
Contributor

@pasanw pasanw commented Jan 17, 2024

Also fixes a UT flake.

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

  • Milestone set according to targeted release.
  • Appropriate labels:
    • kind/bug if this is a bugfix.
    • kind/enhancement if this is a a new feature.
    • enterprise if this PR applies to Calico Enterprise only.

@pasanw pasanw requested a review from a team as a code owner January 17, 2024 21:34
@marvin-tigera marvin-tigera added this to the v1.33.0 milestone Jan 17, 2024
@pasanw pasanw force-pushed the tiers-reporting branch 2 times, most recently from fe22139 to d49ca9e Compare January 17, 2024 22:50
@@ -133,6 +133,9 @@ func (r *ReconcileTiers) Reconcile(ctx context.Context, request reconcile.Reques
reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
reqLogger.Info("Reconciling Tiers")

// Mark CR as found even though this controller is not associated with a CR, as OnCRFound() enables TigeraStatus reporting.
r.status.OnCRFound()
Copy link
Contributor

@Brian-McM Brian-McM Jan 18, 2024

Choose a reason for hiding this comment

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

So we were already attempting to report a tier status, this was all that prevented it from actually being reported?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, the controller was already following the pattern of reporting a degraded status before failing the reconcile, perhaps from copy-paste. It was intentional for the controller to not report to TigeraStatus though

@pasanw pasanw merged commit 8dde857 into tigera:master Jan 18, 2024
5 checks passed
@pasanw pasanw deleted the tiers-reporting branch January 18, 2024 20:32
@danudey danudey modified the milestones: v1.33.0, v1.34.0 Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants