Skip to content

Conversation

@ymettier
Copy link
Contributor

Signed-off-by: Yves Mettier ymettier@free.fr

This PR allows to specify additionnal labels on podMonitors and PrometheusRules.

This is needed when you are using Prometheus-Operator and when you configured it to use specific podMonitors and specific PrometheusRules using a specific label.

Important note : I have not bumped the chart version in Chart.yaml (because I don't know when you may merge this PR).

Signed-off-by: Yves Mettier <ymettier@free.fr>
@russellb
Copy link
Contributor

@gclawes FYI

@gclawes
Copy link
Contributor

gclawes commented Jun 14, 2021

Values.schema.json should be updated whenever new fields are added to values.yaml. @ymettier let me know if you need help with this, or would like me to add a commit to this PR myself.

On the subject of Chart.yaml versions, this is incremented by the MetalLB release process, and not individual PRs for the charts.

@ymettier
Copy link
Contributor Author

I guess you will do it faster and better than I. @gclawes thanks in advance if you can do it : feel free to add a commit !

gclawes added 2 commits June 16, 2021 12:58
Signed-off-by: Graeme Lawes <graemelawes@gmail.com>
…y release process

Signed-off-by: Graeme Lawes <graemelawes@gmail.com>
@gclawes
Copy link
Contributor

gclawes commented Jun 16, 2021

@russellb I've pushed the relevant changes to value.schema.json and Chart.yaml to https://github.com/gclawes/metallb/tree/additionalLabels

Edit: commits here: https://github.com/ymettier/metallb/compare/additionalLabels...gclawes:additionalLabels

@russellb
Copy link
Contributor

@gclawes i pushed your commits to this PR

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
# NOTE: this value is updated by the metallb release process
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, @gclawes . This is a nit for the future, but maybe we should change "0.9.6" to something else, like "0.0.0" ... I just thought of this, but now this version in main is behind what's in the v0.10 branch, since that automation just updates the release branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, that makes sense.

@russellb
Copy link
Contributor

Thanks, everyone. I'm going to wait for tests to all pass, but I'd also like to add something to the release notes. I'll handle the release notes part.

Add a release note for the addition in PR #886.
@russellb russellb merged commit 5f1d8c5 into metallb:main Jun 17, 2021
@russellb russellb added this to the v0.11.0 milestone Oct 7, 2021
rata pushed a commit to kinvolk/metallb that referenced this pull request Feb 17, 2022
Add a release note for the addition in PR metallb#886.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants