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: Remove instructions for nodeinit on various platforms #17635

Merged
merged 2 commits into from Oct 26, 2021

Conversation

joestringer
Copy link
Member

nodeinit: Move azure bridge handing under azure.enabled

The azure bridge handling code in nodeinit was previously run in every
environment where nodeinit is enabled instead of only when azure.enabled
was set. Move this set of code inside the azure conditional section of the
template.

docs: Remove nodeinit instructions where unused

* The install/kubernetes/cilium/files/nodeinit/startup.bash template
  file is primarily dependent on explicit nodeinit configurations for it
  to have any effect, eg:
  * .Values.nodeinit.removeCbrBridge
  * .Values.nodeinit.reconfigureKubelet
  * .Values.gke.enabled ...
  * .Values.azure.enabled
  * .Values.nodeinit.revertReconfigureKubelet
* The install/kubernetes/cilium/files/nodeinit/prestop.bash template
  file is also similarly mainly dependent on other options, with one
  exception: it can delete the cilium_host device.

Given that the alibaba ENI, aws-cni, AWS ENI mode, and kind installation
instructions don't configure these other options, the nodeinit daemonset
does not need to be installed on these systems. The only case that
should differ is upon shutdown of the nodeinit DS, which doesn't fully
clean up Cilium state anyway so users should use 'cilium uninstall' CLI
to clean up such clusters.

The azure bridge handling code in nodeinit was previously run in every
environment where nodeinit is enabled instead of only when azure.enabled
was set. Move this set of code inside the azure conditional section of the
template.

Signed-off-by: Joe Stringer <joe@cilium.io>
* The install/kubernetes/cilium/files/nodeinit/startup.bash template
  file is primarily dependent on explicit nodeinit configurations for it
  to have any effect, eg:
  * .Values.nodeinit.removeCbrBridge
  * .Values.nodeinit.reconfigureKubelet
  * .Values.gke.enabled ...
  * .Values.azure.enabled
  * .Values.nodeinit.revertReconfigureKubelet
* The install/kubernetes/cilium/files/nodeinit/prestop.bash template
  file is also similarly mainly dependent on other options, with one
  exception: it can delete the cilium_host device.

Given that the alibaba ENI, aws-cni, AWS ENI mode, and kind installation
instructions don't configure these other options, the nodeinit daemonset
does not need to be installed on these systems. The only case that
should differ is upon shutdown of the nodeinit DS, which doesn't fully
clean up Cilium state anyway so users should use 'cilium uninstall' CLI
to clean up such clusters.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested review from a team as code owners October 18, 2021 17:57
@joestringer joestringer requested a review from a team October 18, 2021 17:57
@joestringer joestringer added the release-note/misc This PR makes changes that have no direct user impact. label Oct 18, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Oct 18, 2021
Copy link
Member

@qmonnet qmonnet 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.

@joestringer
Copy link
Member Author

Only changes are docs (passing CI check) + one helm Azure change, which is not covered by helm CI, only by the cilium-cli based CI. Marking ready to merge.

@joestringer joestringer added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 26, 2021
@kkourt kkourt merged commit 6f1aacf into cilium:master Oct 26, 2021
@joestringer joestringer deleted the submit/fix-nodeinit-docs branch February 14, 2022 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants