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

Jump to bottom

Kubernetes SD: Support discovery.k8s.io/v1 EndpointSlice #9570

Merged
merged 1 commit into from Mar 22, 2022
Merged

Kubernetes SD: Support discovery.k8s.io/v1 EndpointSlice #9570

merged 1 commit into from Mar 22, 2022

Conversation

Dentrax
Copy link
Contributor

@Dentrax Dentrax commented Oct 22, 2021 •
edited

Signed-off-by: Furkan furkan.turkal@trendyol.com
Co-authored-by: Batuhan batuhan.apaydin@trendyol.com
Co-authored-by: Erkan erkan.zileli@trendyol.com

Fixes #9498

The discovery.k8s.io/v1beta1 API version of EndpointSlice will no longer be served in v1.25.

TODO:

  • endpointslice_adaptor.go is not implemented yet
  • make unit tests pass

Hey @w0wka91, we added you in the repository as a collaborator, if you want to work on feel free to commit k8s-discovery-v1 branch! Looking forward to your contributions!

cc: @developer-guy @erkanzileli @tksm @roidelapluie

@Dentrax Dentrax requested a review from brancz as a code owner October 22, 2021 20:58
@erkanzileli erkanzileli force-pushed the k8s-discovery-v1 branch 2 times, most recently from c6d7a2a to cd88c31 Compare October 23, 2021 19:19
@roidelapluie roidelapluie reopened this Nov 16, 2021
@roidelapluie
Copy link
Member

Thanks for your PR. For legal reasons, we require that all commits are signed with a DCO before we can merge them. See this blog post for considerations around this.

This means that the last line of your commit message should read like:

Signed-Off-By: Your Name <your@email.address>

If you are using GitHub through the web interface, it's quickest to close this PR and open a new one with the appropriate line.

If you are using Git on the command line, it is probably quickest to amend and force push. You can do that with

git commit --amend --signoff
git push -f $remote $remote_branch_for_pr

As always, be careful when force-pushing.

@brancz
Copy link
Member

brancz commented Nov 22, 2021

The direction of this is looking good! As Julien said, we will need the DCO to be signed off.

@stale stale bot added the stale label Jan 21, 2022
@roidelapluie roidelapluie reopened this Feb 16, 2022
@stale stale bot removed the stale label Feb 16, 2022
@roidelapluie
Copy link
Member

close/reopen to trigger CI

@Dentrax
Copy link
Contributor Author

Dentrax commented Feb 16, 2022

close/reopen to trigger CI

One of the tests should fail due to incorrect service labels set, working on to fix this! - e.addServiceLabels(eps, tg) does not get triggered on service updates

@Dentrax Dentrax force-pushed the k8s-discovery-v1 branch 3 times, most recently from 2791b51 to 47fdada Compare February 17, 2022 07:35
@brancz
Copy link
Member

brancz commented Feb 17, 2022

It seems from the PR description that there are still some work-in-progress things. Please feel free to ping us when you think this is ready for review!

@Dentrax Dentrax changed the title [W.I.P] Kubernetes SD: Support discovery.k8s.io/v1 EndpointSlice Kubernetes SD: Support discovery.k8s.io/v1 EndpointSlice Feb 17, 2022
@Dentrax
Copy link
Contributor Author

Dentrax commented Feb 17, 2022 •
edited

It seems from the PR description that there are still some work-in-progress things. Please feel free to ping us when you think this is ready for review!

Thanks, updated the title and description! I think we're now ready to review since all tests are passed.

@Dentrax
Copy link
Contributor Author

Dentrax commented Mar 10, 2022

Kind ping, is there anything you want me to do here?

brancz
brancz approved these changes Mar 17, 2022
View reviewed changes
Copy link
Member

@brancz brancz left a comment

Choose a reason for hiding this comment

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

My apologies, this one slipped through the cracks. This lgtm!

@brancz
Copy link
Member

brancz commented Mar 17, 2022 •
edited

Sorry my bad, as I was going through notifications I merged another PR that unfortunately now created a conflict with this one. Could you resolve the conflict? Then this is ready to merge from my side.

@Dentrax @developer-guy
Kubernetes SD: Support discovery.k8s.io/v1 EndpointSlice
2939966 
Fixes prometheus#9498

Signed-off-by: Furkan <furkan.turkal@trendyol.com>
Signed-off-by: Erkan Zileli <erkan.zileli@trendyol.com>
Co-authored-by: Batuhan Apaydin <batuhan.apaydin@trendyol.com>
@Dentrax
Copy link
Contributor Author

Dentrax commented Mar 18, 2022

NP! Just resolved conflicts and rebased.

@brancz
Copy link
Member

brancz commented Mar 22, 2022 •
edited

Thank youuuuuuuu! lgtm 🎉

@brancz brancz merged commit f1ea413 into prometheus:main Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brancz brancz brancz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

endpointslice: support apiVersion discovery.k8s.io/v1
3 participants
@Dentrax @roidelapluie @brancz