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

kube-proxy: Fix NewProxyServer #56256

Merged
merged 1 commit into from
Nov 23, 2017
Merged

kube-proxy: Fix NewProxyServer #56256

merged 1 commit into from
Nov 23, 2017
+18 −4

Conversation

thockin
Copy link
Member

@thockin thockin commented Nov 22, 2017 •
edited
Loading

Different OSes need different args. This is not a great fix, but better
than adding an arg to Windows which doesn't need it.

Fixes #56238

NONE

@thockin
Fix NewProxyServer
7977828 
Different OSes need different args.  This is not a great fix, but better
than adding an arg to Windows which doesn't need it.
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 22, 2017
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 22, 2017
@thockin thockin added this to the v1.9 milestone Nov 22, 2017
@thockin thockin added kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. labels Nov 22, 2017
@cblecker
Copy link
Member

/release-note-none
/sig network

@k8s-ci-robot k8s-ci-robot added the sig/network Categorizes an issue or PR as relevant to SIG Network. label Nov 22, 2017
caseydavenport
caseydavenport reviewed Nov 22, 2017
View reviewed changes
cmd/kube-proxy/app/server_windows.go
@@ -46,7 +46,11 @@ import (
)

// NewProxyServer returns a new ProxyServer.
func NewProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExit bool, scheme *runtime.Scheme, master string) (*ProxyServer, error) {
func NewProxyServer(o *Options) (*ProxyServer, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Just double checking, but we're OK to have the "cleanup ipvs" flag (and maybe others) ignored on windows, rather than returning a "not supported" type error?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think that's the easiest path forward. The flags are kind of a mess, and being cross-platform makes it 10x worse. We need a more holistic answer

@caseydavenport
Copy link
Member

/status approved-for-milestone

@caseydavenport
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 22, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caseydavenport, thockin

Associated issue: 56238

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@caseydavenport
Copy link
Member

/status in-progress

@thockin
Copy link
Member Author

thockin commented Nov 22, 2017

Our bots are so demanding.

@thockin
Copy link
Member Author

thockin commented Nov 22, 2017

/retest pull-kubernetes-node-e2e

@thockin
Copy link
Member Author

thockin commented Nov 22, 2017

/retest

@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request Current

@caseydavenport @dcbw @thockin

Note: This pull request is marked as priority/critical-urgent, and must be updated every 1 day during code freeze.

Example update:

ACK.  In progress
ETA: DD/MM/YYYY
Risks: Complicated fix required
Pull Request Labels
  • sig/network: Pull Request will be escalated to these SIGs if needed.
  • priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@thockin
Copy link
Member Author

thockin commented Nov 23, 2017

All green but I don't see it in queue ?

@cblecker
Copy link
Member

I see it in queue now, @thockin.

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 56249, 56118, 56255, 56252, 56256). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 7f85218 into kubernetes:master Nov 23, 2017
@sjenning sjenning mentioned this pull request Nov 27, 2017
Closed
@thockin thockin deleted the fix-broken-NewProxyServer branch August 14, 2019 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caseydavenport caseydavenport caseydavenport left review comments

Assignees

@caseydavenport caseydavenport

@dcbw dcbw

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. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.

cross-build: PR 56036 causing cross build failure
6 participants
@thockin @cblecker @caseydavenport @k8s-github-robot @dcbw @k8s-ci-robot