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.

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

docs: Added instruction to also delete kube-proxy configmap #14847

Merged
merged 1 commit into from
Feb 11, 2021
Merged

docs: Added instruction to also delete kube-proxy configmap #14847

merged 1 commit into from
Feb 11, 2021

Conversation

yoshz
Copy link
Contributor

@yoshz yoshz commented Feb 3, 2021

This makes sure that kube-proxy is not reinstalled again on kubeadm upgrades from > 1.19.

@yoshz yoshz requested a review from a team as a code owner February 3, 2021 09:51
@yoshz yoshz requested review from a team and joestringer February 3, 2021 09:51
@maintainer-s-little-helper
Copy link

Commit 0ddb54edb078f7a5d5b982db960603c9ca79066e does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Feb 3, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Feb 3, 2021
@yoshz yoshz requested a review from aditighag February 3, 2021 09:51
@maintainer-s-little-helper
Copy link

Commits 0ddb54edb078f7a5d5b982db960603c9ca79066e, ac3a342ee506f646d593dede5315049b6b5a66dc do not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@brb brb added needs-backport/1.8 release-note/misc This PR makes changes that have no direct user impact. labels Feb 3, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 3, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.4 Feb 3, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.7 Feb 3, 2021
@brb
Copy link
Member

brb commented Feb 3, 2021

@yoshz Thanks! Could you sign off the commit (git commit -s --amend && git push -f)?

@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Feb 3, 2021
@christarazi christarazi added this to Needs backport from master in 1.9.5 Feb 3, 2021
@christarazi christarazi removed this from Needs backport from master in 1.9.4 Feb 3, 2021
@brb
Copy link
Member

brb commented Feb 7, 2021

@yoshz Thanks for the change. Could you keep the comment saying why the CM deletion is needed?

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Welcome to the community! Docs structure LGTM. Please do address @brb's feedback at your convenience.

@maintainer-s-little-helper
Copy link

Commit 91b28a163e494e1dfdd7984c46c78fa2f8775810 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Feb 10, 2021
@maintainer-s-little-helper
Copy link

Commit 91b28a163e494e1dfdd7984c46c78fa2f8775810 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@yoshz
Copy link
Contributor Author

yoshz commented Feb 10, 2021

I have added the comment.

@joestringer
Copy link
Member

I'm not sure why the bot is still complaining about signoffs, but would you mind squashing the two commits together? Maybe that will help. This page describes how to achieve this:

https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git

Signed-off-by: Yosh de Vos <yosh@elzorro.nl>
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Feb 11, 2021
@yoshz
Copy link
Contributor Author

yoshz commented Feb 11, 2021

Squashed the commits together, hopefully should be fine now.

@joestringer joestringer merged commit ae96b92 into cilium:master Feb 11, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.7 Feb 12, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.5 Feb 12, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.7 Feb 15, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.5 Feb 15, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.5 Feb 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.8.7
Backport done to v1.8
1.9.5
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

6 participants