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.

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

Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure #4272

Merged
merged 1 commit into from Jul 20, 2023
Merged

Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure #4272

merged 1 commit into from Jul 20, 2023

Conversation

lzhecheng
Copy link
Contributor

@lzhecheng lzhecheng commented Jul 13, 2023 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure. IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted().

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure. IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 13, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 13, 2023
@lzhecheng
Copy link
Contributor Author

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 13, 2023
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-ccm-ipv6-capz
/test pull-cloud-provider-azure-e2e-ccm-vmss-ipv6-capz
/test pull-cloud-provider-azure-e2e-ccm-dualstack-capz
/test pull-cloud-provider-azure-e2e-ccm-vmss-dualstack-capz

@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-ccm-ipv6-vmss-capz
/test pull-cloud-provider-azure-e2e-ccm-dualstack-vmss-capz

@lzhecheng
Copy link
Contributor Author

/retest

@lzhecheng lzhecheng force-pushed the fix-ipv6-ensure-bp-deleted branch 2 times, most recently from 61c67fa to 5f79ef5 Compare July 14, 2023 10:25
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-ccm-ipv6-capz
/test pull-cloud-provider-azure-e2e-ccm-dualstack-capz
/test pull-cloud-provider-azure-e2e-ccm-ipv6-vmss-capz
/test pull-cloud-provider-azure-e2e-ccm-dualstack-vmss-capz

nilo19
nilo19 reviewed Jul 19, 2023
View reviewed changes
pkg/provider/azure_standard.go Outdated
var nicUpdated atomic.Bool
for k := range ipconfigPrefixToNicMap {
nic := ipconfigPrefixToNicMap[k]
newIPConfigs := *nic.IPConfigurations
for j, ipConf := range newIPConfigs {
if !pointer.BoolDeref(ipConf.Primary, false) {
if isServiceIPv4 && !pointer.BoolDeref(ipConf.Primary, false) {
// found primary ip configuration
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we remove this line? It seems not right to be here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

@lzhecheng
Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure
366cbec 
* IP config of IPv6 is not primary, it should not be
skipped in EnsureBackendPoolDeleted(). Updated e2e code.
* Fix health probe e2e

Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
@nilo19
Copy link
Contributor

nilo19 commented Jul 19, 2023

/lgtm

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

/retest

1 similar comment
@lzhecheng
Copy link
Contributor Author

/retest

feiskyer
feiskyer reviewed Jul 20, 2023
View reviewed changes
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, lzhecheng

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

@feiskyer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 20, 2023
@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot
Copy link

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.27 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.27

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.

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot
Copy link

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.26 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.26

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.

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.25

@k8s-infra-cherrypick-robot
Copy link

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.25 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.25

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 merged commit 9ff5c58 into kubernetes-sigs:master Jul 20, 2023
16 checks passed
@k8s-infra-cherrypick-robot
Copy link

@lzhecheng: #4272 failed to apply on top of branch "release-1.27":

Applying: Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
Using index info to reconstruct a base tree...
M	pkg/provider/azure_standard.go
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
CONFLICT (content): Merge conflict in tests/e2e/network/ensureloadbalancer.go
Auto-merging pkg/provider/azure_standard.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.27

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-infra-cherrypick-robot
Copy link

@lzhecheng: #4272 failed to apply on top of branch "release-1.26":

Applying: Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
Using index info to reconstruct a base tree...
M	pkg/provider/azure_standard.go
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
CONFLICT (content): Merge conflict in tests/e2e/network/ensureloadbalancer.go
Auto-merging pkg/provider/azure_standard.go
CONFLICT (content): Merge conflict in pkg/provider/azure_standard.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.26

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-infra-cherrypick-robot
Copy link

@lzhecheng: #4272 failed to apply on top of branch "release-1.25":

Applying: Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
Using index info to reconstruct a base tree...
M	pkg/provider/azure_standard.go
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
CONFLICT (content): Merge conflict in tests/e2e/network/ensureloadbalancer.go
Auto-merging pkg/provider/azure_standard.go
CONFLICT (content): Merge conflict in pkg/provider/azure_standard.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.25

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.

@lzhecheng lzhecheng deleted the fix-ipv6-ensure-bp-deleted branch July 20, 2023 11:23
@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot
Copy link

@lzhecheng: #4272 failed to apply on top of branch "release-1.26":

Applying: Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
Using index info to reconstruct a base tree...
M	pkg/provider/azure_standard.go
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
CONFLICT (content): Merge conflict in tests/e2e/network/ensureloadbalancer.go
Auto-merging pkg/provider/azure_standard.go
CONFLICT (content): Merge conflict in pkg/provider/azure_standard.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix IPv6/dual-stack EnsureBackendPoolDeleted() failure * IP config of IPv6 is not primary, it should not be skipped in EnsureBackendPoolDeleted(). Updated e2e code. * Fix health probe e2e
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.26

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

@nilo19 nilo19 nilo19 left review comments

@andyzhangx andyzhangx Awaiting requested review from andyzhangx

@MartinForReal MartinForReal Awaiting requested review from MartinForReal

Assignees

@feiskyer feiskyer

@nilo19 nilo19

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lzhecheng @nilo19 @k8s-ci-robot @feiskyer @k8s-infra-cherrypick-robot