-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
fix(operator): Skip updating annotations for serviceaccounts #13450
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
JoaoBraveCoding
approved these changes
Jul 9, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
periklis
changed the title
fix(operator): Allow only merging annotations for serviceaccounts
fix(operator): Skip updating annotations for serviceaccounts
Jul 11, 2024
xperimental
approved these changes
Jul 11, 2024
periklis
added a commit
to periklis/loki
that referenced
this pull request
Jul 11, 2024
periklis
added a commit
to periklis/loki
that referenced
this pull request
Jul 11, 2024
openshift-merge-bot bot
added a commit
to openshift/loki
that referenced
this pull request
Jul 11, 2024
[release-5.9] Backport PR grafana#13450
openshift-merge-bot bot
added a commit
to openshift/loki
that referenced
this pull request
Jul 11, 2024
[release-5.8] Backport PR grafana#13450
This was referenced Aug 15, 2024
This was referenced Oct 14, 2024
This was referenced Oct 21, 2024
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.
What this PR does / why we need it:
The following PR disables a total overwrite of the serviceaccount annotations and keeps relying on merging them only. This can lead to unwanted reconciliation across operators sharing ownership on specific annotations (e.g. OCP 4.16 adds and owns
config.openshift.io/serving-cert-secret-name
) .Although none of the manifested serviceaccount resources in our code based makes use of custom annotations, the patch makes the mutate function future proof.Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.md
guide (required)feat
PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR