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 is a follow-up to #1039 as merging it caused
main
branch to fail unit tests.How did this happen?
addon
, which wasn't tested in jsonnet: unify internal configuration field name #1039main
was stale at the point of merging.Up for discussion:
Should we enable
Require branches to be up to date before merging
checkbox in branch protection rules formain
branch? This should prevent issues as one we just experienced, but at the same time will require much more frequent rebases of PRs./cc @prometheus-operator/prometheus-operator-reviewers