github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99433 from navist2020/fix/kubeadm/out_info

Browse Source 
Replace yml with yaml
This commit is contained in:
Kubernetes Prow Robot 2021-02-28 09:50:39 -08:00 committed by GitHub
commit 4880b996b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/init/markcontrolplane.go
View File

@ -27,7 +27,7 @@ import (
var ( var (
markControlPlaneExample = cmdutil.Examples(` markControlPlaneExample = cmdutil.Examples(`
# Applies control-plane label and taint to the current node, functionally equivalent to what executed by kubeadm init. # Applies control-plane label and taint to the current node, functionally equivalent to what executed by kubeadm init.
kubeadm init phase mark-control-plane --config config.yml kubeadm init phase mark-control-plane --config config.yaml
# Applies control-plane label and taint to a specific node # Applies control-plane label and taint to a specific node
kubeadm init phase mark-control-plane --node-name myNode kubeadm init phase mark-control-plane --node-name myNode

2
cmd/kubeadm/app/cmd/phases/init/preflight.go
View File

@ -30,7 +30,7 @@ import (
var ( var (
preflightExample = cmdutil.Examples(` preflightExample = cmdutil.Examples(`
# Run pre-flight checks for kubeadm init using a config file. # Run pre-flight checks for kubeadm init using a config file.
kubeadm init phase preflight --config kubeadm-config.yml kubeadm init phase preflight --config kubeadm-config.yaml
`) `)
) )

2
cmd/kubeadm/app/cmd/phases/join/preflight.go
View File

@ -36,7 +36,7 @@ import (
var ( var (
preflightExample = cmdutil.Examples(` preflightExample = cmdutil.Examples(`
# Run join pre-flight checks using a config file. # Run join pre-flight checks using a config file.
kubeadm join phase preflight --config kubeadm-config.yml kubeadm join phase preflight --config kubeadm-config.yaml
`) `)
notReadyToJoinControlPlaneTemp = template.Must(template.New("join").Parse(dedent.Dedent(` notReadyToJoinControlPlaneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`