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

docs: Remove instructions for nodeinit on various platforms #17635

Merged
merged 2 commits into from
Oct 26, 2021
Merged

docs: Remove instructions for nodeinit on various platforms #17635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d5d8b
nodeinit: Move azure bridge handing under azure.enabled
joestringer Oct 18, 2021
a2eb297
docs: Remove nodeinit instructions where unused
joestringer Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions Documentation/gettingstarted/alibabacloud-eni.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ Deploy Cilium release via Helm:
--set alibabacloud.enabled=true \\
--set ipam.mode=alibabacloud \\
--set enableIPv4Masquerade=false \\
--set tunnel=disabled \\
--set nodeinit.enabled=true
--set tunnel=disabled

.. note::

Expand Down
3 changes: 1 addition & 2 deletions Documentation/gettingstarted/cni-chaining-aws-cni.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ Deploy Cilium via Helm:
--namespace kube-system \\
--set cni.chainingMode=aws-cni \\
--set enableIPv4Masquerade=false \\
--set tunnel=disabled \\
--set nodeinit.enabled=true
--set tunnel=disabled

This will enable chaining with the AWS VPC CNI plugin. It will also disable
tunneling, as it's not required since ENI IP addresses can be directly routed
Expand Down
3 changes: 1 addition & 2 deletions Documentation/gettingstarted/k8s-install-helm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ Install Cilium
--set eni.enabled=true \\
--set ipam.mode=eni \\
--set egressMasqueradeInterfaces=eth0 \\
--set tunnel=disabled \\
--set nodeinit.enabled=true
--set tunnel=disabled

.. note::

Expand Down
3 changes: 0 additions & 3 deletions Documentation/gettingstarted/kind.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ Then, install Cilium release via Helm:

helm install cilium |CHART_RELEASE| \\
--namespace kube-system \\
--set nodeinit.enabled=true \\
--set kubeProxyReplacement=partial \\
--set hostServices.enabled=false \\
--set externalIPs.enabled=true \\
Expand Down Expand Up @@ -172,7 +171,6 @@ Make sure context is set to ``kind-cluster2`` cluster.

helm install cilium |CHART_RELEASE| \\
--namespace kube-system \\
--set nodeinit.enabled=true \\
--set kubeProxyReplacement=partial \\
--set hostServices.enabled=false \\
--set externalIPs.enabled=true \\
Expand All @@ -191,7 +189,6 @@ Change the kubectl context to ``kind-cluster1`` cluster:

helm install cilium |CHART_RELEASE| \\
--namespace kube-system \\
--set nodeinit.enabled=true \\
--set kubeProxyReplacement=partial \\
--set hostServices.enabled=false \\
--set externalIPs.enabled=true \\
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/files/nodeinit/startup.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ iptables -w -t nat -D POSTROUTING -m comment --comment "ip-masq: ensure nat POST
date > {{ .Values.nodeinit.bootstrapFile }}
{{- end }}

{{- if .Values.azure.enabled }}
# AKS: If azure-vnet is installed on the node, and (still) configured in bridge mode,
# configure it as 'transparent' to be consistent with Cilium's CNI chaining config.
# If the azure-vnet CNI config is not removed, kubelet will execute CNI CHECK commands
Expand All @@ -57,7 +58,6 @@ if [ -f /etc/cni/net.d/10-azure.conflist ]; then
sed -i 's/"mode":\s*"bridge"/"mode":"transparent"/g' /etc/cni/net.d/10-azure.conflist
fi

{{- if .Values.azure.enabled }}
# The azure0 interface being present means the node was booted with azure-vnet configured
# in bridge mode. This means there might be ebtables rules and neight entries interfering
# with pod connectivity if we deploy with Azure IPAM.
Expand Down