Skip to content

Rename traefik.docker.* labels for Docker Swarm to traefik.swarm.* #11247

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.

Sign up for GitHub

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
Merged
traefiker merged 2 commits into from
Dec 10, 2024
Merged

Rename traefik.docker.* labels for Docker Swarm to traefik.swarm.* #11247

traefiker merged 2 commits into from
Dec 10, 2024

Conversation

@anchal00
Copy link
Contributor

@anchal00 anchal00 commented Nov 2, 2024 •
edited
Loading

What does this PR do?

This PR adds support for traefik.swarm.* labels and deprecates traefik.docker.* labels for docker Swarm

Motivation

Resolution for #11244

(as per suggestions from @kevinpollet in #11207 (review) )

More

  • Added/updated tests
  • Added/updated documentation

Additional Notes

I took the liberty to slightly refactor the code as well, in order to get rid of nested if-else blocks. I hope that's not a problem.

@anchal00 anchal00 force-pushed the rename-swarm-labels branch from c93ab7e to e5406c6 Compare November 2, 2024 13:19
@anchal00 anchal00 mentioned this pull request Nov 2, 2024
Closed
2 tasks
@anchal00
Copy link
Contributor Author

anchal00 commented Nov 2, 2024 •
edited
Loading

Hii @kevinpollet @rtribotte . I am not sure why test-unit job is failing. I checked it fails on master as well. Is there a way to see a condensed summary of failing tests ?

Could you please take a look at this PR when you get a chance and suggest me what can i do here ?

@nmengin
Copy link
Contributor

nmengin commented Nov 4, 2024

Hello @anchal00,

Thank you for your contribution.
As it's a bugfix, could you rebase your Pr on the branch v3.2please?

@rtribotte
Copy link
Member

rtribotte commented Nov 4, 2024

@anchal00 We relaunched the CI, everything is ok now.

@anchal00 anchal00 force-pushed the rename-swarm-labels branch from e5406c6 to c3ac5fe Compare November 5, 2024 09:04
@anchal00 anchal00 changed the base branch from master to v3.2 November 5, 2024 09:06
@anchal00 anchal00 changed the title Deprecate 'traefik.docker.*' labels for Docker Swarm Rename 'traefik.docker.*' labels for Docker Swarm to 'traefik.swarm.*' Nov 5, 2024
@anchal00
Copy link
Contributor Author

anchal00 commented Nov 5, 2024

Hello @anchal00,

Thank you for your contribution. As it's a bugfix, could you rebase your Pr on the branch v3.2please?

@nmengin Sure, i have rebased to v3.2 branch.

@rtribotte rtribotte added this to the 3.2 milestone Nov 5, 2024
@kevinpollet kevinpollet mentioned this pull request Nov 5, 2024
Closed
2 tasks
@anchal00
Copy link
Contributor Author

anchal00 commented Nov 15, 2024

Hii @kevinpollet @rtribotte, could you please review this PR when you get a chance. Thankyou

@kevinpollet
Copy link
Member

kevinpollet commented Nov 20, 2024

Hello @anchal00,

We are reviewing this pull request, to iterate faster, can we push review commits on your branch?
If you prefer we can open a pull request on it.

@anchal00
Copy link
Contributor Author

anchal00 commented Nov 22, 2024

Hii @kevinpollet , Sure you can push review commits to my branch. It's fine by me, so please go ahead !

@nmengin nmengin added priority/P1 need to be fixed in next release and removed priority/P1 need to be fixed in next release labels Nov 27, 2024
sdelicata
sdelicata approved these changes Dec 6, 2024
View reviewed changes
Copy link
Contributor

@sdelicata sdelicata left a comment

Choose a reason for hiding this comment

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

LGTM

@kevinpollet kevinpollet changed the title Rename 'traefik.docker.*' labels for Docker Swarm to 'traefik.swarm.*' Rename traefik.docker.* labels for Docker Swarm to traefik.swarm.* Dec 10, 2024
@kevinpollet kevinpollet force-pushed the rename-swarm-labels branch 2 times, most recently from 403b1ae to c5fe086 Compare December 10, 2024 08:23
kevinpollet
kevinpollet approved these changes Dec 10, 2024
View reviewed changes
Copy link
Member

@kevinpollet kevinpollet left a comment

Choose a reason for hiding this comment

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

Thanks 👍

rtribotte
rtribotte approved these changes Dec 10, 2024
View reviewed changes
Copy link
Member

@rtribotte rtribotte left a comment

Choose a reason for hiding this comment

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

Thanks!

@traefiker traefiker merged commit 5149146 into traefik:v3.2 Dec 10, 2024
39 of 40 checks passed
@markkimsal markkimsal mentioned this pull request Jul 14, 2025
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kevinpollet kevinpollet kevinpollet approved these changes

@sdelicata sdelicata sdelicata approved these changes

@rtribotte rtribotte rtribotte approved these changes

Assignees

No one assigned

Labels

area/provider/docker/swarm area/provider/docker kind/bug/fix a bug fix size/S

Projects

None yet

Milestone

3.2

Development

Successfully merging this pull request may close these issues.

6 participants

@anchal00 @nmengin @rtribotte @kevinpollet @sdelicata @traefiker