Skip to content
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

v1.10 backport of "Allowed to set labels to ServiceMonitors" #17746

Merged
merged 1 commit into from
Nov 5, 2021

Conversation

canhnt
Copy link
Contributor

@canhnt canhnt commented Nov 1, 2021

Once this PR is merged, you can update the PR labels via:

$ for pr in 17509; do contrib/backporting/set-labels.py $pr done 1.10; done

@canhnt canhnt requested a review from a team as a code owner November 1, 2021 09:15
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels Nov 1, 2021
@gandro
Copy link
Member

gandro commented Nov 1, 2021

Thanks for the backport! Reviewers, please see the following comment for some context: #17509 (comment)

@nathanjsweet
Copy link
Member

/test-backport-1.10

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

The commit description should reference the master commit. See other backported commits on branch v1.10 for examples on the format.

In general, I'd recommend using our backporting scripts as they configure all that automatically: https://docs.cilium.io/en/latest/contributing/release/backports/#creating-the-backports-branch.

@canhnt
Copy link
Contributor Author

canhnt commented Nov 5, 2021

The commit description should reference the master commit. See other backported commits on branch v1.10 for examples on the format.

In general, I'd recommend using our backporting scripts as they configure all that automatically: https://docs.cilium.io/en/latest/contributing/release/backports/#creating-the-backports-branch.

@pchaigno : May I just update commit description following the backport template? Using backport script requires needs-backport/1.0 label for #17509 and backport-pending/1.10 for this PR, that I cannot add labels myself.

@kaworu kaworu changed the title Allowed to set labels to ServiceMonitors - Backport PR#17509 v1.10 backport of "Allowed to set labels to ServiceMonitors" Nov 5, 2021
@kaworu
Copy link
Member

kaworu commented Nov 5, 2021

I've updated this PR title, description, and added the backport-pending/1.10 label to #17509. @canhnt please set the commit message to:

Allowed to set labels to ServiceMonitors

[ upstream commit 105e1ab10b560957e1d550ece789ef77ea990c15 ]

Signed-off-by: Canh Ngo <canhnt@gmail.com>

and then re-request a review from @pchaigno.

@canhnt canhnt force-pushed the v1.10-helm-label-servicemonitors branch 2 times, most recently from c4962e5 to 725df67 Compare November 5, 2021 12:36
@kaworu kaworu self-requested a review November 5, 2021 12:36
@canhnt
Copy link
Contributor Author

canhnt commented Nov 5, 2021

I've updated this PR title, description, and added the backport-pending/1.10 label to #17509. @canhnt please set the commit message to:

Allowed to set labels to ServiceMonitors

[ upstream commit fe5628875b730a58886f41c3f4919849649151c2 ]

Signed-off-by: Canh Ngo <canhnt@gmail.com>

and then re-request a review from @pchaigno.

@kaworu : Is commit id fe5628875b730a58886f41c3f4919849649151c2 correct? That is fe56288

It seems the 105e1ab10b560957e1d550ece789ef77ea990c15 refers to the commit in the #17746: 105e1ab

contrib: Allowed to set labels to ServiceMonitors

[ upstream commit 105e1ab ]

Signed-off-by: Canh Ngo <canhnt@gmail.com>
@kaworu
Copy link
Member

kaworu commented Nov 5, 2021

@canhnt yes 105e1ab is the correct one, sorry for my confusion!

@canhnt canhnt force-pushed the v1.10-helm-label-servicemonitors branch from 725df67 to 1f4bbf7 Compare November 5, 2021 12:39
@canhnt
Copy link
Contributor Author

canhnt commented Nov 5, 2021

@canhnt yes 105e1ab is the correct one, sorry for my confusion!

Thank you. I updated commit message as suggested.

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

Thanks @kaworu and @canhnt!

@kaworu
Copy link
Member

kaworu commented Nov 5, 2021

/test-backport-1.10

@pchaigno
Copy link
Member

pchaigno commented Nov 5, 2021

This change is not covered by end-to-end tests and reviews are in. Marking ready to merge and merging.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 5, 2021
@pchaigno pchaigno merged commit b2b3047 into cilium:v1.10 Nov 5, 2021
@canhnt canhnt deleted the v1.10-helm-label-servicemonitors branch November 5, 2021 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants