Skip to content

fix(operator): Skip updating annotations for serviceaccounts - #13450

Merged
periklis merged 1 commit into
grafana:mainfrom
periklis:operator-fix-sa-annotations
Jul 11, 2024
Merged

fix(operator): Skip updating annotations for serviceaccounts#13450
periklis merged 1 commit into
grafana:mainfrom
periklis:operator-fix-sa-annotations

Conversation

@periklis

@periklis periklis commented Jul 8, 2024

Copy link
Copy Markdown
Collaborator

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

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@periklis periklis self-assigned this Jul 8, 2024
@periklis
periklis requested review from a team and xperimental as code owners July 8, 2024 18:08

@JoaoBraveCoding JoaoBraveCoding left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

lgtm

@periklis periklis changed the title fix(operator): Allow only merging annotations for serviceaccounts Jul 11, 2024
@periklis
periklis merged commit 1b9b111 into grafana:main 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
openshift-merge-bot Bot added a commit to openshift/loki that referenced this pull request Jul 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

3 participants