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

Restart kube-proxy using kubeadm & add bootstrapper.WaitCluster #4276

Merged
merged 5 commits into from
May 17, 2019
Merged

Restart kube-proxy using kubeadm & add bootstrapper.WaitCluster #4276

merged 5 commits into from
May 17, 2019

Conversation

tstromberg
Copy link
Contributor

@tstromberg tstromberg commented May 16, 2019 •
edited
Loading

The logic in updateKubeProxyConfigMap was broken: there is no need for kube-proxy to be online to update the config map for it. This PR lets kubeadm handle the kube-proxy restart instead, which apparently does things correctly on newer Kubernetes versions.

Full credit goes to @liubog2008 who proposed a similar approach in #4014

NOTE: This PR also moves validateCluster to bootstrapper.WaitCluster to allow for more a more tuned implementation.

This fixes #3843

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 16, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tstromberg

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 May 16, 2019
@tstromberg tstromberg requested review from medyagh and removed request for dlorenc May 16, 2019 20:31
@tstromberg tstromberg mentioned this pull request May 16, 2019
Closed
@tstromberg tstromberg changed the title Use kubeadm to restart kube-proxy rather than rolling our own Restart kube-proxy with kubeadm instead of rolling our own approach May 16, 2019
@tstromberg tstromberg changed the title Restart kube-proxy with kubeadm instead of rolling our own approach Restart kube-proxy with kubeadm instead of rolling our own May 16, 2019
@tstromberg tstromberg changed the title Restart kube-proxy with kubeadm instead of rolling our own Restart kube-proxy using kubeadm May 16, 2019
@tstromberg tstromberg changed the title Restart kube-proxy using kubeadm Restart kube-proxy using kubeadm & add bootstrapper.WaitCluster() May 16, 2019
@tstromberg tstromberg changed the title Restart kube-proxy using kubeadm & add bootstrapper.WaitCluster() Restart kube-proxy using kubeadm & add bootstrapper.WaitCluster May 16, 2019
medyagh
medyagh approved these changes May 16, 2019
View reviewed changes
Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@tstromberg tstromberg merged commit af049bd into kubernetes:master May 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@medyagh medyagh medyagh approved these changes

@sharifelgamal sharifelgamal sharifelgamal approved these changes

Assignees
No one assigned
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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

restart: waiting for k8s-app=kube-proxy: timed out waiting for the condition
4 participants
@tstromberg @k8s-ci-robot @medyagh @sharifelgamal