-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
[bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision #29276
Merged
andresbono
merged 3 commits into
bitnami:main
from
HStry:bitnami/nginx_bugfix/prometheusrules-label-collision
Sep 11, 2024
Merged
[bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision #29276
andresbono
merged 3 commits into
bitnami:main
from
HStry:bitnami/nginx_bugfix/prometheusrules-label-collision
Sep 11, 2024
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
Increase patch version number. Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com>
This commit removes a conflicting label from the prometheusrules template. Two labels with the key 'app.kubernetes.io/component' existed. This is not possible, and caused issues with FluxCD. This change removes the first label 'app.kubernetes.io/component=nginx' as it was overwritten with 'app.kubernetes.io/component=metrics' during manual installs. Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
4 tasks
carrodher
added
verify
Execute verification workflow for these changes
in-progress
labels
Sep 6, 2024
andresbono
approved these changes
Sep 11, 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! Thank you for contributing with this fix!
bartramakers
pushed a commit
to bartramakers/bitnami-charts
that referenced
this pull request
Sep 18, 2024
…ion (bitnami#29276) * [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision Increase patch version number. Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com> * [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision This commit removes a conflicting label from the prometheusrules template. Two labels with the key 'app.kubernetes.io/component' existed. This is not possible, and caused issues with FluxCD. This change removes the first label 'app.kubernetes.io/component=nginx' as it was overwritten with 'app.kubernetes.io/component=metrics' during manual installs. Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> --------- Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
mike12806
pushed a commit
to mike12806/charts
that referenced
this pull request
Oct 30, 2024
…ion (bitnami#29276) * [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision Increase patch version number. Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com> * [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision This commit removes a conflicting label from the prometheusrules template. Two labels with the key 'app.kubernetes.io/component' existed. This is not possible, and caused issues with FluxCD. This change removes the first label 'app.kubernetes.io/component=nginx' as it was overwritten with 'app.kubernetes.io/component=metrics' during manual installs. Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> --------- Signed-off-by: Hans Strijker <45356184+HStry@users.noreply.github.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Michael Faherty <80599490+mike12806@users.noreply.github.com>
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.
Description of the change
This change removes a conflicting label from the prometheusrules template. Two labels with the key 'app.kubernetes.io/component' existed. This is not possible, and caused issues with FluxCD. This change removes the first label 'app.kubernetes.io/component=nginx' as it was overwritten with 'app.kubernetes.io/component=metrics' during manual installs anyways.
Benefits
This chart can be deployed by FluxCD
Possible drawbacks
None
Applicable issues
Additional information
Checklist
Chart.yaml
according to semver. This is not necessary when the changes only affect README.md files.README.md
using readme-generator-for-helm