Skip to content

Commit a16a126

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#51064 from madhanrm/winkernelproxy
Automatic merge from submit-queue (batch tested with PRs 51064, 52132). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Fix Kubeproxy to work for Windows Kernel mode **What this PR does / why we need it**: Kubeproxy doenst work for with windows kernel mode. This PR adds a Kernel Proxy for windows to use the underlying platform features. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # kubernetes#49666 **Special notes for your reviewer**: **Release note**: ```release-note ```
2 parents 5c7dab4 + a8d797a commit a16a126

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+10661
-312
lines changed

Godeps/Godeps.json

+7-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/LICENSES

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/kube-proxy/app/BUILD

+15-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ go_library(
1111
srcs = [
1212
"conntrack.go",
1313
"server.go",
14-
],
14+
"server_others.go",
15+
] + select({
16+
"@io_bazel_rules_go//go/platform:windows_amd64": [
17+
"server_windows.go",
18+
],
19+
"//conditions:default": [],
20+
}),
1521
deps = [
1622
"//pkg/api:go_default_library",
1723
"//pkg/apis/componentconfig:go_default_library",
@@ -28,13 +34,11 @@ go_library(
2834
"//pkg/proxy/iptables:go_default_library",
2935
"//pkg/proxy/ipvs:go_default_library",
3036
"//pkg/proxy/userspace:go_default_library",
31-
"//pkg/proxy/winuserspace:go_default_library",
3237
"//pkg/util/configz:go_default_library",
3338
"//pkg/util/dbus:go_default_library",
3439
"//pkg/util/iptables:go_default_library",
3540
"//pkg/util/ipvs:go_default_library",
3641
"//pkg/util/mount:go_default_library",
37-
"//pkg/util/netsh:go_default_library",
3842
"//pkg/util/node:go_default_library",
3943
"//pkg/util/oom:go_default_library",
4044
"//pkg/util/pointer:go_default_library",
@@ -62,7 +66,14 @@ go_library(
6266
"//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library",
6367
"//vendor/k8s.io/client-go/tools/record:go_default_library",
6468
"//vendor/k8s.io/utils/exec:go_default_library",
65-
],
69+
] + select({
70+
"@io_bazel_rules_go//go/platform:windows_amd64": [
71+
"//pkg/proxy/winkernel:go_default_library",
72+
"//pkg/proxy/winuserspace:go_default_library",
73+
"//pkg/util/netsh:go_default_library",
74+
],
75+
"//conditions:default": [],
76+
}),
6677
)
6778

6879
go_test(

0 commit comments

Comments
 (0)