github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122144 from Jerry-yz/master

Browse Source 
kubeadm: update func CreateJoinControlPlaneKubeConfigFiles variable name
This commit is contained in:
Kubernetes Prow Robot 2023-12-14 06:18:52 +01:00 committed by GitHub
commit 6e7f503e1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
View File

@ -79,10 +79,10 @@ type kubeConfigSpec struct {
// When not using external CA mode, if a kubeconfig file already exists it is used only if evaluated equal, // When not using external CA mode, if a kubeconfig file already exists it is used only if evaluated equal,
// otherwise an error is returned. For external CA mode, the creation of kubeconfig files is skipped. // otherwise an error is returned. For external CA mode, the creation of kubeconfig files is skipped.
func CreateJoinControlPlaneKubeConfigFiles(outDir string, cfg *kubeadmapi.InitConfiguration) error { func CreateJoinControlPlaneKubeConfigFiles(outDir string, cfg *kubeadmapi.InitConfiguration) error {
var externaCA bool var externalCA bool
caKeyPath := filepath.Join(cfg.CertificatesDir, kubeadmconstants.CAKeyName) caKeyPath := filepath.Join(cfg.CertificatesDir, kubeadmconstants.CAKeyName)
if _, err := os.Stat(caKeyPath); os.IsNotExist(err) { if _, err := os.Stat(caKeyPath); os.IsNotExist(err) {
externaCA = true externalCA = true
} }
files := []string{ files := []string{
@ -92,7 +92,7 @@ func CreateJoinControlPlaneKubeConfigFiles(outDir string, cfg *kubeadmapi.InitCo
} }
for _, file := range files { for _, file := range files {
if externaCA { if externalCA {
fmt.Printf("[kubeconfig] External CA mode: Using user provided %s\n", file) fmt.Printf("[kubeconfig] External CA mode: Using user provided %s\n", file)
continue continue
} }