Skip to content

Fix Shield protection orphaning when deleting ALBs during ingress teardown#4580

Open
ShiriNmi1520 wants to merge 3 commits intokubernetes-sigs:mainfrom
ShiriNmi1520:shieldProtectionCleanup
Open

Fix Shield protection orphaning when deleting ALBs during ingress teardown#4580
ShiriNmi1520 wants to merge 3 commits intokubernetes-sigs:mainfrom
ShiriNmi1520:shieldProtectionCleanup

Conversation

@ShiriNmi1520
Copy link
Copy Markdown

Issue

Fixes #4042

Description

This PR fixes orphaned AWS Shield protections when an ALB is deleted during a full Ingress teardown.

Key changes:

  • Added Shield cleanup in the ALB deletion path in load_balancer_synthesizer:
    • Before deleting an unmatched ALB, the controller now checks for existing Shield protection and deletes it if it is controller-managed.
    • Cleanup is limited to ALBs and only runs when Shield reconciliation is enabled/subscribed.
  • Kept ownership safety:
    • Unmanaged Shield protections are detected and intentionally not deleted.
  • Refactored Shield subscription gating:
    • stack_deployer now computes shieldReconcileEnabled once and uses it for both Shield synthesiser registration and ALB delete-time cleanup.
  • Reused managed-name logic:
    • Introduced/reused IsManagedProtectionName in Shield synth code to keep behaviour consistent.
  • Added regression tests:
    • New tests cover ALB teardown, cleanup flow and error/guardrail cases (cleanup disabled, non-ALB, unmanaged protection, API errors).

Manual validation:
Executed make test.

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
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

Details 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

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla Bot commented Feb 12, 2026

CLA Signed
The committers listed above are authorized under a signed CLA.

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Welcome @ShiriNmi1520!

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 12, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Hi @ShiriNmi1520. 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.

Details

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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 12, 2026
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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dangling AWS Shield Protections after Ingress are deleted

2 participants