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

Replace custom dualstack support logic in Windows Kube-proxy #104952

Merged
merged 1 commit into from
Sep 23, 2021
Merged

Replace custom dualstack support logic in Windows Kube-proxy #104952

merged 1 commit into from
Sep 23, 2021

Conversation

dcantah
Copy link
Member

@dcantah dcantah commented Sep 13, 2021 •
edited

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Due to an incorrect version range definition in hcsshim for dualstack support, the Windows kube-proxy had to define its own version range logic to check if dualstack was supported on the host. This was remedied in hcsshim (microsoft/hcsshim#1003) and this work has been vendored into K8s as well (#104880). This change simply makes use of the now correct version range to check if dual stack is supported, and gets rid of the old custom logic.

cc @marosset @sbangari

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 13, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @dcantah. Thanks for your PR.

I'm waiting for a kubernetes 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. sig/network Categorizes an issue or PR as relevant to SIG Network. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 13, 2021
@dcantah
Copy link
Member Author

dcantah commented Sep 13, 2021

/sig windows

@k8s-ci-robot k8s-ci-robot added the sig/windows Categorizes an issue or PR as relevant to SIG Windows. label Sep 13, 2021
@marosset
Copy link
Contributor

@jayunit100 do you want to take a look?

@marosset
Copy link
Contributor

/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 Sep 13, 2021
@marosset
Copy link
Contributor

Can we add the min version of hcsshim that properly handles version range checks to the comments in the PR?

@dcantah
Copy link
Member Author

dcantah commented Sep 13, 2021

@marosset Sure!

@dcantah
Copy link
Member Author

dcantah commented Sep 13, 2021

@marosset Done!

@marosset
Copy link
Contributor

/lgtm
/assign @jayunit100

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 13, 2021
@dcantah
Copy link
Member Author

dcantah commented Sep 16, 2021

@elweb9858 @jayunit100 Anyone able to give this a look?

jsturtevant
jsturtevant suggested changes Sep 22, 2021
View reviewed changes
pkg/proxy/winkernel/proxier.go Outdated Show resolved Hide resolved
pkg/proxy/winkernel/proxier.go Outdated Show resolved Hide resolved
@dcantah
Replace custom dualstack support logic in Windows Kube-proxy
ce52f70 
Due to an incorrect version range definition in hcsshim for dualstack
support, the Windows kubeproxy had to define it's own version range logic
to check if dualstack was supported on the host. This was remedied in hcsshim
(microsoft/hcsshim#1003) and this work has been vendored into
K8s as well (kubernetes#104880). This
change simply makes use of the now correct version range to check if dualstack
is supported, and gets rid of the old custom logic.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 22, 2021
@jsturtevant
Copy link
Contributor

/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 22, 2021
@jsturtevant
Copy link
Contributor

/lgtm
/test pull-kubernetes-e2e-aks-engine-windows-containerd

@sbangari for approval

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 22, 2021
@sbangari
Copy link
Contributor

/lgtm

@sbangari
Copy link
Contributor

/approve

@sbangari
Copy link
Contributor

@dcantah Thanks for cleaning this up!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcantah, sbangari

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 Sep 23, 2021
@k8s-ci-robot k8s-ci-robot merged commit 86003a2 into kubernetes:master Sep 23, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 23, 2021
@dcantah dcantah mentioned this pull request Sep 27, 2021
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsturtevant jsturtevant jsturtevant requested changes

@elweb9858 elweb9858 Awaiting requested review from elweb9858

@madhanrm madhanrm Awaiting requested review from madhanrm

Assignees

@jsturtevant jsturtevant

@jayunit100 jayunit100

@marosset marosset

@sbangari sbangari

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dcantah @k8s-ci-robot @marosset @jsturtevant @sbangari @jayunit100