Add license status to cluster output #312
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewstucki
requested review from
RafalKorepta and
chrisseto
as code owners
chrisseto
approved these changes
Nov 15, 2024
| @@ -174,10 +175,10 @@ func (r *RedpandaReconciler) Reconcile(c context.Context, req ctrl.Request) (ctr | |||
|
|
|||
| defer func() { | |||
| durationMsg := fmt.Sprintf("reconciliation finished in %s", time.Since(start).String()) | |||
| log.Info(durationMsg) | |||
| log.V(logger.TraceLevel).Info(durationMsg) | |||
There was a problem hiding this comment.
We should really just be relying on a time series metric for this anyhow 😓
| @@ -408,24 +413,13 @@ func (r *RedpandaReconciler) reconcileDefluxed(ctx context.Context, rp *v1alpha2 | |||
| return nil | |||
| } | |||
|
|
|||
| func (r *RedpandaReconciler) reconcileClusterConfig(ctx context.Context, rp *v1alpha2.Redpanda) error { | |||
| func (r *RedpandaReconciler) ratelimitCondition(ctx context.Context, rp *v1alpha2.Redpanda, conditionType string) bool { | |||
There was a problem hiding this comment.
nit: add a comment here noting that this function require the Ready condition to be true.
shouldReconcileCondition might be a bit more descriptive and ergonomic?
| case rpadmin.LicenseStatusValid: | ||
| status = metav1.ConditionTrue | ||
| reason = "LicenseValid" | ||
| message = "Valid" |
There was a problem hiding this comment.
Just for future proofing and better debuggability:
default:
reason = "LicenseStatusUnknown"
message = fmt.Sprintf("unknown license status: %q", features.LicenseStatus)I've been bitten by missing defaults too many times.
…ssertions run too slowly
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a cluster license status to the Redpanda CRD. The test to leverage this checks across a couple of different Redpanda versions to show how this behaves with the new auto-installed test license v. no license being present on the system whatsoever.
Edit: note that I also hid more logging behind
TraceLevelso I can actually see test failures. If these need to be turned up in tests, you can always do so in the test setup temporarily (or maybe we can add a flag to do it on-demand?)