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

Don't set kube-proxy cluster-cidr with aws-vpc-cni #5579

Merged
merged 1 commit into from
Aug 10, 2018
Merged

Don't set kube-proxy cluster-cidr with aws-vpc-cni #5579

merged 1 commit into from
Aug 10, 2018

Conversation

spikecurtis
Copy link
Contributor

Fixes #4674

Don't set kube-proxy cluster-cidr with aws-vpc-cni
1540f90 
Signed-off-by: Spike Curtis <spike@tigera.io>
@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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 3, 2018
@spikecurtis
Copy link
Contributor Author

/assign @KashifSaadat

@spikecurtis
Copy link
Contributor Author

/assign @justinsb

@spikecurtis
Copy link
Contributor Author

cc @liwenwu-amazon

@chrisz100
Copy link
Contributor

/ok-to-test
/lgtm

Valid point you got there! Thanks!

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 6, 2018
@chrisz100
Copy link
Contributor

@mikesplain @justinsb looks like something for 1.10 imho.

@KashifSaadat
Copy link
Contributor

@spikecurtis good spot, thanks for fixing this. :)

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrisz100, KashifSaadat, spikecurtis

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 Aug 10, 2018
@k8s-ci-robot k8s-ci-robot merged commit 3092429 into kubernetes:master Aug 10, 2018
@spikecurtis spikecurtis mentioned this pull request Aug 28, 2018
Closed
@spikecurtis spikecurtis deleted the kube-proxy-no-cluster-cidr branch August 28, 2018 21:09
@igorvpcleao
Copy link

@spikecurtis Cherry-picking your commit and running kops update cluster is enough for fixing this issue in clusters already created?

@spikecurtis
Copy link
Contributor Author

@igorvpcleao I'm afraid I don't actually know about kops internals enough to answer. If it doesn't solve your issue, you might try the workaround in #5337

@WarpRat
Copy link
Contributor

WarpRat commented Sep 19, 2018

@igorvpcleao That's what we did: cherry picked the commit, built a new binary, and ran kops update cluster then kops rolling-update cluster. Fixed the issue without having to rebuild the cluster.

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

@justinsb justinsb

@chrisz100 chrisz100

@KashifSaadat KashifSaadat

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@spikecurtis @chrisz100 @KashifSaadat @k8s-ci-robot @igorvpcleao @WarpRat @justinsb