Merge pull request prometheus-operator#7130 from simonpasquier/fix-7114

fix: revert removal of the `proxyURL` field
stolostron · Nov 21, 2024 · 214f1bc · 214f1bc
2 parents 40104e6 + d756de7
commit 214f1bc
Show file tree

Hide file tree

Showing 18 changed files with 616 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased
+
+* [BUGFIX] Revert the removal of the `proxyURL` field in `AlertmanagerConfig` CRD. The field takes precedence over `proxyUrl`. #7114
+
 ## 0.78.1 / 2024-10-30
 
 * [BUGFIX] Fix container images for architectures other than `amd64`. #7065 #7066 #7067

diff --git a/Documentation/api.md b/Documentation/api.md
diff --git a/bundle.yaml b/bundle.yaml