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

Organize network docs differently and add Multus #257

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

manuelbuil
Copy link
Contributor

@manuelbuil manuelbuil commented Mar 27, 2024

This PR adds information about how to use Multus with additional IPAMs (e.g. whereabouts).
Moreover, it consolidates all networking information in the Networking tab, which has three different sections:

  • Basic Network Options
  • Distributed hybrid or multicloud cluster
  • Multus and IPAM plugins
  • Networking Services

The networking information under installation gets removed

Having all together felt too much for just one document

image

@manuelbuil manuelbuil force-pushed the newNetworkDocs branch 8 times, most recently from 8515447 to 912e372 Compare March 27, 2024 09:53
Copy link
Member

@dereknola dereknola left a comment

Choose a reason for hiding this comment

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

I think its time we moved the networking stuff out of the installation dropdown and just integrate it at the top level. Incorporate the existing network page as "Network Components", because its basically a reference page on what various networking addons do.

@manuelbuil
Copy link
Contributor Author

I think its time we moved the networking stuff out of the installation dropdown and just integrate it at the top level. Incorporate the existing network page as "Network Components", because its basically a reference page on what various networking addons do.

This has always been in my mind but I was hesitant to do it. On the one hand, having two different Network sections is strange but I think the separation was made based on: what's related to setting up the cluster and what's not. On the other hand, if we consolidate everything in one Networking section outside of the installation dropdown, we would have installation related parts that are not in the installation section, which could also be confusing?

@manuelbuil manuelbuil force-pushed the newNetworkDocs branch 5 times, most recently from 5e7c93a to 85a678d Compare April 2, 2024 08:45
@manuelbuil manuelbuil requested a review from dereknola April 2, 2024 08:50
Copy link
Member

Choose a reason for hiding this comment

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

If we're going to move this file, can we keep a redirect or placeholder page in place so that old links to https://docs.k3s.io/installation/network-options continue to work?

@dereknola any suggestions on how to accomplish this?

Copy link
Member

Choose a reason for hiding this comment

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

Good point, @manuelbuil you just need to add a line at https://github.com/k3s-io/docs/blob/main/docusaurus.config.js#L121

{ from: '/installation/network-options', to: '/networking/basic-network-options' },

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks!

@manuelbuil manuelbuil requested a review from mgfritch April 4, 2024 14:52
Copy link

@mgfritch mgfritch left a comment

Choose a reason for hiding this comment

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

a few optional nits that might help with the readability, otherwise lgtm!

docs/networking/multus-ipams.md Outdated Show resolved Hide resolved
docs/networking/multus-ipams.md Outdated Show resolved Hide resolved
docs/networking/multus-ipams.md Outdated Show resolved Hide resolved
docs/networking/multus-ipams.md Outdated Show resolved Hide resolved
docs/networking/multus-ipams.md Show resolved Hide resolved
docs/networking/multus-ipams.md Show resolved Hide resolved
Copy link

@mgfritch mgfritch left a comment

Choose a reason for hiding this comment

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

lgtm!

</Tabs>
Copy link
Contributor

Choose a reason for hiding this comment

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

what's changed here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nothing, I think it is a strange Github effect. The </Tabs> is correct

@@ -17,7 +17,7 @@
"@docusaurus/core": "^3.2.0",
"@docusaurus/plugin-client-redirects": "^3.2.0",
"@docusaurus/preset-classic": "^3.2.0",
"@docusaurus/theme-common": "^3.0.1",
"@docusaurus/theme-common": "^3.2.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it right to change also these files?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. I think it is ok because things are still working and my env requires that to make docs work

<TabItem value="host-local" default>
The host-local IPAM plugin allocates ip addresses out of a set of address ranges. It stores the state locally on the host filesystem, hence ensuring uniqueness of IP addresses on a single host. Therefore, we don't recommend it for multi-node clusters. This IPAM plugin does not require any extra deployment. For more information: https://www.cni.dev/plugins/current/ipam/host-local/.

To use the host-local plugin, please create a file called `multus-values.yaml` with the following content:

Choose a reason for hiding this comment

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

In which folder should the user create this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It does not matter, it is used later as values for the helm install command:

helm install multus rke2-charts/rke2-multus -n kube-system --kubeconfig /etc/rancher/k3s/k3s.yaml --values multus-values.yaml

Choose a reason for hiding this comment

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

Ok I was confused. I thought it was used to deploy multus automatically

@manuelbuil manuelbuil merged commit 1c21041 into k3s-io:main Apr 8, 2024
3 checks passed
@manuelbuil manuelbuil deleted the newNetworkDocs branch April 8, 2024 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants