fix(annotations): remove prometheus annotations when DisablePrometheusAnnotations is true#5234
Closed
AruneshDwivedi wants to merge 1 commit into
Closed
Conversation
…sAnnotations is true When DisablePrometheusAnnotations was set to true after initial creation, the operator would not remove existing prometheus pod annotations (prometheus.io/scrape, prometheus.io/port, prometheus.io/path). The PodAnnotations function only handled the additive path. When the flag was true, it simply skipped adding annotations but never removed ones that were already present from a previous state. Fix: when DisablePrometheusAnnotations is true, explicitly delete the known prometheus annotation keys from the pod annotations map. Also fixed the comment that incorrectly said 'nil or true' instead of 'nil or false'. Added test case for the disable-after-create transition. Fixes open-telemetry#5043 Signed-off-by: Arunesh Dwivedi <arunesh.devops@gmail.com>
Contributor
|
This looks like a duplicate of #5069. As you can see in that PR, this is unfortunately a deeper hole than initially expected, but we're close to resolving it. |
Author
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When DisablePrometheusAnnotations was set to true after initial creation, the operator would not remove existing prometheus pod annotations (prometheus.io/scrape, prometheus.io/port, prometheus.io/path).
The PodAnnotations function only handled the additive path. When the flag was true, it simply skipped adding annotations but never removed ones already present from a previous state.
Fix: when DisablePrometheusAnnotations is true, explicitly delete the known prometheus annotation keys from the pod annotations map.
Also fixed the comment that incorrectly said 'nil or true' instead of 'nil or false'. Added test case for the disable-after-create transition.
Fixes #5043