Skip to content

K
k3s
Commit 2ed6e531 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52153 from lukemarsden/tweak-kubeadm-intro-text

Automatic merge from submit-queue (batch tested with PRs 51601, 52153, 52364, 52362, 52342) Improve kubeadm help text * Replace 'misc' with more specific at-mentions bugs and feature-requests. * Replace ReplicaSets with Deployments as example, because ReplicaSets are dated. * Generalize join example. Before: ``` ┌──────────────────────────────────────────────────────────┐ │ KUBEADM IS BETA, DO NOT USE IT FOR PRODUCTION CLUSTERS! │ │ │ │ But, please try it out! Give us feedback at: │ │ https://github.com/kubernetes/kubeadm/issues │ │ and at-mention @kubernetes/sig-cluster-lifecycle-misc │ └──────────────────────────────────────────────────────────┘ Example usage: Create a two-machine cluster with one master (which controls the cluster), and one node (where your workloads, like Pods and ReplicaSets run). ┌──────────────────────────────────────────────────────────┐ │ On the first machine │ ├──────────────────────────────────────────────────────────┤ │ master# kubeadm init │ └──────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────┐ │ On the second machine │ ├──────────────────────────────────────────────────────────┤ │ node# kubeadm join --token=<token> <ip-of-master>:<port> │ └──────────────────────────────────────────────────────────┘ You can then repeat the second step on as many other machines as you like. ``` After (changes highlighted with `<--`): ``` ┌──────────────────────────────────────────────────────────┐ │ KUBEADM IS BETA, DO NOT USE IT FOR PRODUCTION CLUSTERS! │ │ │ │ But, please try it out! Give us feedback at: │ │ https://github.com/kubernetes/kubeadm/issues │ │ and at-mention @kubernetes/sig-cluster-lifecycle-bugs │ <-- │ or @kubernetes/sig-cluster-lifecycle-feature-requests │ <-- └──────────────────────────────────────────────────────────┘ Example usage: Create a two-machine cluster with one master (which controls the cluster), and one node (where your workloads, like Pods and Deployments run). <-- ┌──────────────────────────────────────────────────────────┐ │ On the first machine │ ├──────────────────────────────────────────────────────────┤ │ master# kubeadm init │ └──────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────┐ │ On the second machine │ ├──────────────────────────────────────────────────────────┤ │ node# kubeadm join <arguments-returned-from-init> │ <-- └──────────────────────────────────────────────────────────┘ You can then repeat the second step on as many other machines as you like. ``` cc @luxas
parents a91c8939 60a16cfe
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
cmd/kubeadm/app/cmd/cmd.go
View file @ 2ed6e531
...@@ -39,13 +39,14 @@ func NewKubeadmCommand(_ io.Reader, out, err io.Writer) *cobra.Command { ...@@ -39,13 +39,14 @@ func NewKubeadmCommand(_ io.Reader, out, err io.Writer) *cobra.Command {
│ │ │ │
│ But, please try it out! Give us feedback at: │ │ But, please try it out! Give us feedback at: │
│ https://github.com/kubernetes/kubeadm/issues │ │ https://github.com/kubernetes/kubeadm/issues │
│ and at-mention @kubernetes/sig-cluster-lifecycle-misc │ │ and at-mention @kubernetes/sig-cluster-lifecycle-bugs │
│ or @kubernetes/sig-cluster-lifecycle-feature-requests │
└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘
Example usage: Example usage:
Create a two-machine cluster with one master (which controls the cluster), Create a two-machine cluster with one master (which controls the cluster),
and one node (where your workloads, like Pods and ReplicaSets run). and one node (where your workloads, like Pods and Deployments run).
┌──────────────────────────────────────────────────────────┐ ┌──────────────────────────────────────────────────────────┐
│ On the first machine │ │ On the first machine │
...@@ -56,7 +57,7 @@ func NewKubeadmCommand(_ io.Reader, out, err io.Writer) *cobra.Command { ...@@ -56,7 +57,7 @@ func NewKubeadmCommand(_ io.Reader, out, err io.Writer) *cobra.Command {
┌──────────────────────────────────────────────────────────┐ ┌──────────────────────────────────────────────────────────┐
│ On the second machine │ │ On the second machine │
├──────────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────────┤
│ node# kubeadm join --token=<token> <ip-of-master>:<port> │ │ node# kubeadm join <arguments-returned-from-init> │
└──────────────────────────────────────────────────────────┘ └──────────────────────────────────────────────────────────┘
You can then repeat the second step on as many other machines as you like. You can then repeat the second step on as many other machines as you like.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment