mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-21 22:49:31 +00:00
delete all duplicate empty blanks
Signed-off-by: Xiang Dai <764524258@qq.com>
This commit is contained in:
@@ -53,7 +53,7 @@ var (
|
||||
` + cmdutil.AlphaDisclaimer)
|
||||
|
||||
selfhostingExample = normalizer.Examples(`
|
||||
# Converts a static Pod-hosted control plane into a self-hosted one.
|
||||
# Converts a static Pod-hosted control plane into a self-hosted one.
|
||||
|
||||
kubeadm alpha phase self-hosting convert-from-staticpods
|
||||
`)
|
||||
|
@@ -77,7 +77,7 @@ var (
|
||||
joinLongDescription = dedent.Dedent(`
|
||||
When joining a kubeadm initialized cluster, we need to establish
|
||||
bidirectional trust. This is split into discovery (having the Node
|
||||
trust the Kubernetes Control Plane) and TLS bootstrap (having the
|
||||
trust the Kubernetes Control Plane) and TLS bootstrap (having the
|
||||
Kubernetes Control Plane trust the Node).
|
||||
|
||||
There are 2 main schemes for discovery. The first is to use a shared
|
||||
@@ -93,7 +93,7 @@ var (
|
||||
|
||||
If you use a shared token for discovery, you should also pass the
|
||||
--discovery-token-ca-cert-hash flag to validate the public key of the
|
||||
root certificate authority (CA) presented by the Kubernetes Control Plane.
|
||||
root certificate authority (CA) presented by the Kubernetes Control Plane.
|
||||
The value of this flag is specified as "<hash-type>:<hex-encoded-value>",
|
||||
where the supported hash type is "sha256". The hash is calculated over
|
||||
the bytes of the Subject Public Key Info (SPKI) object (as in RFC7469).
|
||||
|
@@ -45,7 +45,7 @@ var (
|
||||
short: "Generates a kubeconfig file for the kubelet to use *only* for cluster bootstrapping purposes",
|
||||
long: normalizer.LongDesc(`
|
||||
Generates the kubeconfig file for the kubelet to use and saves it to %s file.
|
||||
|
||||
|
||||
Please note that this should *only* be used for cluster bootstrapping purposes. After your control plane is up,
|
||||
you should request all kubelet credentials from the CSR API.`),
|
||||
},
|
||||
|
@@ -36,7 +36,7 @@ import (
|
||||
|
||||
var (
|
||||
uploadKubeadmConfigLongDesc = fmt.Sprintf(normalizer.LongDesc(`
|
||||
Uploads the kubeadm ClusterConfiguration to a ConfigMap called %s in the %s namespace.
|
||||
Uploads the kubeadm ClusterConfiguration to a ConfigMap called %s in the %s namespace.
|
||||
This enables correct configuration of system components and a seamless user experience when upgrading.
|
||||
|
||||
Alternatively, you can use kubeadm config.
|
||||
|
@@ -43,7 +43,7 @@ var (
|
||||
upgradeNodeConfigLongDesc = normalizer.LongDesc(`
|
||||
Downloads the kubelet configuration from a ConfigMap of the form "kubelet-config-1.X" in the cluster,
|
||||
where X is the minor version of the kubelet. kubeadm uses the --kubelet-version parameter to determine
|
||||
what the _desired_ kubelet version is. Give
|
||||
what the _desired_ kubelet version is. Give
|
||||
`)
|
||||
|
||||
upgradeNodeConfigExample = normalizer.Examples(fmt.Sprintf(`
|
||||
|
@@ -1,5 +1,5 @@
|
||||
apiVersion: kubeadm.k8s.io/v1beta1
|
||||
kind: InitConfiguration
|
||||
kind: InitConfiguration
|
||||
bootstrapTokens:
|
||||
- token: s73ybu.6tw6wnqgp5z0wb77
|
||||
localAPIEndpoint:
|
||||
|
Reference in New Issue
Block a user