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 ip_pref configuration option #9076

Merged
merged 2 commits into from
Oct 7, 2023
Merged

Fix ip_pref configuration option #9076

merged 2 commits into from
Oct 7, 2023

Conversation

CFSworks
Copy link
Contributor

@CFSworks CFSworks commented Sep 9, 2023

Currently, containerd treats ip_pref = "ipv6" the same as ip_pref = "cni", because the loop meant to select the first IPv6 address instead selects the first IP address of any kind.

This problem has been allowed to go unnoticed because the test case said to check the behavior when the first input address is an IPv4 address is actually providing an IPv6 address first.

This PR corrects both of the above.

@CFSworks
Don't use To16() != nil to detect IPv6 addresses
88a8496 
The ip.To16() function returns non-nil if `ip` is any kind
of IP address, including IPv4. To look for IPv6 specifically,
use ip.To4() == nil.

Signed-off-by: Sam Edwards <[email protected]>
@CFSworks
Fix "even if IPv4 comes first" test to have IPv4 first
f77185f 
Signed-off-by: Sam Edwards <[email protected]>
@k8s-ci-robot
Copy link

Hi @CFSworks. Thanks for your PR.

I'm waiting for a containerd 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.

@kzys kzys added cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Oct 6, 2023
@samuelkarp samuelkarp merged commit 841c693 into containerd:main Oct 7, 2023
kiashok added a commit to kiashok/containerd-containerd that referenced this pull request Oct 23, 2024
@kiashok
Merged PR 8946463: [fork-external/main] Update fork-external/main wit…
ebe5b9b 
…h upstream containerd/main

update fork-external/main branch to upstream containerd/main at commit f90f80d

Related work items: containerd#8736, containerd#8861, containerd#8924, containerd#8934, containerd#9027, containerd#9076, containerd#9104, containerd#9118, containerd#9141, containerd#9155, containerd#9177, containerd#9183, containerd#9184, containerd#9186, containerd#9187, containerd#9191, containerd#9200, containerd#9205, containerd#9211, containerd#9214, containerd#9215, containerd#9221, containerd#9223, containerd#9228, containerd#9231, containerd#9234, containerd#9242, containerd#9246, containerd#9247, containerd#9251, containerd#9253, containerd#9254, containerd#9255, containerd#9268
@thaJeztah
Copy link
Member

/cherrypick release/1.7

@k8s-infra-cherrypick-robot
Copy link

@thaJeztah: #9076 failed to apply on top of branch "release/1.7":

Applying: Don't use `To16() != nil` to detect IPv6 addresses
Applying: Fix "even if IPv4 comes first" test to have IPv4 first
Using index info to reconstruct a base tree...
M	pkg/cri/sbserver/sandbox_run_test.go
M	pkg/cri/server/sandbox_run_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cri/server/sandbox_run_test.go
CONFLICT (content): Merge conflict in pkg/cri/server/sandbox_run_test.go
Auto-merging pkg/cri/sbserver/sandbox_run_test.go
CONFLICT (content): Merge conflict in pkg/cri/sbserver/sandbox_run_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Fix "even if IPv4 comes first" test to have IPv4 first

In response to this:

/cherrypick release/1.7

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.

@thaJeztah thaJeztah mentioned this pull request Jan 6, 2025
Merged
@thaJeztah thaJeztah added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jan 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kzys kzys kzys approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

Assignees
No one assigned
Labels
cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch needs-ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@CFSworks @k8s-ci-robot @thaJeztah @k8s-infra-cherrypick-robot @kzys @samuelkarp