aws-for-fluent-bit: Add extraLabels parameter, fix ServiceMonitor namespace selector #1035
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
This adds an "extraLabels" parameter to add labels to an internal helper that maintains the labels for the various resources. Also bumps the chart version accordingly.
This commit fixes a namespace selector in the Prometheus Operator's ServiceMonitor definition. If you deploy the Helm release into, say, the default namespace, but use a namespaceOverride to put Fluent Bit into the "fluent-bit" or "cloudwatch" namespace, then this will look in the wrong Kubernetes namespace for your service and you won't get metrics.
crdrost
changed the title
Custom labeling should be applied to the DaemonSet too, and this is possible only if we use the full labels instead of just the selectorLabels.
4 tasks
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.
This adds an "extraLabels" parameter to add labels to an internal helper that maintains the labels for the various resources.
In my usage case, at my work, I maintain an internal framework of Helm charts and other tweaks that we deploy, and we use labels to mark in our users' clusters that these are assets we manage.
This PR also fixes a little bug I noticed in the ServiceMonitor where the Helm namespace and the fluent-bit namespace might not align, in which case metrics don't get to Prometheus, and a little inconsistency in how labels are applied to the DaemonSet vs. everything else.
Issue
I didn't open an issue for this, didn't seem big enough
Description of changes
Checklist
README.mdfor modified charts)versioninChart.yamlfor the modified chart(s)Testing
Tested with
helm template . --values testvalues.yaml | tee result.yamlwith several modifications intestvalues.yamlincluding null extraLabels,{}extraLabels (the default), andand confirmed each case compiled properly.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.