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

Apply #3871 "Update LoadBalancerReadyCondition on deletion" to release-1.5 #3967

Merged

Conversation

mnitchev
Copy link
Contributor

@mnitchev mnitchev commented Jan 9, 2023

The LoadBalancerReadyCondition is sometimes explicitly patched and other times it only updates the awsCluster object. Furthermore the condition won't be patched by the patch helper in the AWSClusterReconciler, because it's not in the patch.WithOwnedConditions list. This change puts the condition in the list and also updates the condition reason to Deleted when the LB is not found. Without setting the condition in that case, the reconciler will set condition to Deleting and it will never go back to Deleted.

Co-authored-by: Jose Armesto github@armesto.net

What type of PR is this?
/kind bug

What this PR does / why we need it:

This is #3871, but for the release-1.5. The original PR could not be backported due to conflicts.

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

The LoadBalancerReadyCondition is sometimes explicitly patched and other
times it only updates the awsCluster object. Furthermore the condition
won't be patched by the patch helper in the AWSClusterReconciler,
because it's not in the `patch.WithOwnedConditions` list.
This change puts the condition in the list and also updates the
condition reason to `Deleted` when the LB is not found. Without setting
the condition in that case, the reconciler will set condition to
`Deleting` and it will never go back to `Deleted`.

Co-authored-by: Jose Armesto <github@armesto.net>
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority labels Jan 9, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @mnitchev. 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/test-infra repository.

@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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 9, 2023
@Skarlso
Copy link
Contributor

Skarlso commented Jan 9, 2023

/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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 9, 2023
@AverageMarcus
Copy link
Member

cc @richardcase

#3871 couldn't be cherry picked due to changes in type imports (I think) conflicting. This PR adds the same logic to the 1.5 codebase.

@dlipovetsky
Copy link
Contributor

The import grouping needs to be fixed: dlipovetsky@feb6e32

I also see the linter complain about a file that isn't touched by this PR: dlipovetsky@2830053

@AverageMarcus
Copy link
Member

/retest

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
@Skarlso
Copy link
Contributor

Skarlso commented Jan 19, 2023

/lgtm /approve

@Skarlso
Copy link
Contributor

Skarlso commented Jan 19, 2023

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 19, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Skarlso

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

The pull request process is described 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2023
@k8s-ci-robot k8s-ci-robot merged commit 5d8786d into kubernetes-sigs:release-1.5 Jan 19, 2023
@AverageMarcus AverageMarcus deleted the set-lb-conditions branch January 19, 2023 10:31
@richardcase
Copy link
Member

/milestone v1.5.3

@k8s-ci-robot k8s-ci-robot added this to the v1.5.3 milestone Mar 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants