Skip to content

Conversation

mwhittington21
Copy link

@mwhittington21 mwhittington21 commented Oct 9, 2025

Issue

#4030

Description

Adds an option to override the existing behaviour where tags added to the controller via the --default-tags argument will override any annotation-specified tags. When the feature is enabled, annotation-specified tags will now override default tags. This had to be added as a toggle-able feature because there are likely many customers that are relying on the current behaviour.

The flag for the new behaviour has been added as a feature gate. It could also be an argument, but the main reason I chose to use a feature gate was to minimise refactoring involved. Feature gates are already passed through the entire codebase, so the amount of scaffolding changes were minimised. Tests were easier to write, and existing tests needed minimal changes.

The feature gate is called EnableDefaultTagsLowPriority, indicating that when enabled it will change the default tags to be of lower priority than other tags.

The majority of changes are in tests. Every other change is just an extra conditional statement in all the areas of code that merge two dicts of tags. I chose to add these conditional statements rather than change the tag merge logic and add an argument as it would only touch the parts of the code related to tags. Anything else using that function remains untouched.

Checklist

  • Added tests that cover your change (if possible)
  • Added/modified documentation as required (such as the README.md, or the docs directory)
  • Manually tested
  • Made sure the title of the PR is a good description that can go into the release notes

BONUS POINTS checklist: complete for good vibes and maybe prizes?! 🤯

  • Backfilled missing tests for code in same general area 🎉
  • Refactored something and made the world a better place 🌟

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 9, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mwhittington21
Once this PR has been reviewed and has the lgtm label, please assign m00nf1sh for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 9, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @mwhittington21!

It looks like this is your first PR to kubernetes-sigs/aws-load-balancer-controller 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/aws-load-balancer-controller has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 9, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @mwhittington21. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 9, 2025
@mwhittington21 mwhittington21 changed the title feat: allow controller default tags to be overridden by annotation supplied tags feat: add feature toggle to allow controller default tags to be overridden by annotation supplied tags Oct 9, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 9, 2025
@zac-nixon
Copy link
Collaborator

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 9, 2025
@mwhittington21 mwhittington21 force-pushed the mwhittington/allow-override-default-tags branch from 73ba5d5 to 525784c Compare October 14, 2025 12:46
@mwhittington21 mwhittington21 force-pushed the mwhittington/allow-override-default-tags branch from 525784c to 3e5a5ba Compare October 14, 2025 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants