Merge pull request #57778 from xiangpengzhao/kubeadm-write-path

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Print the full path of Kubeconfig files. **What this PR does / why we need it**: kubeadm init: ``` [kubeconfig] Wrote KubeConfig file to disk: "admin.conf" [kubeconfig] Wrote KubeConfig file to disk: "kubelet.conf" [kubeconfig] Wrote KubeConfig file to disk: "controller-manager.conf" [kubeconfig] Wrote KubeConfig file to disk: "scheduler.conf" ``` It'd be good to print the path of the KubeConfig files in case users want to view the content of these files. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes https://github.com/kubernetes/kubeadm/issues/656 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57778 from xiangpengzhao/kubeadm-write-path
999c2ae8 · Kubernetes Submit Queue · GitHub · 15b1d165 · 38a8c72f · 999c2ae8
Unverified Commit 999c2ae8 authored Jan 10, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kubeconfig.go cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go +2 -2

No files found.
--- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
+++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
@@ -231,7 +231,7 @@ func createKubeConfigFileIfNotExists(outDir, filename string, config *clientcmda
 			return fmt.Errorf("failed to save kubeconfig file %s on disk: %v", kubeConfigFilePath, err)
 		}

-		fmt.Printf("[kubeconfig] Wrote KubeConfig file to disk: %q\n", filename)
+		fmt.Printf("[kubeconfig] Wrote KubeConfig file to disk: %q\n", kubeConfigFilePath)
 		return nil
 	}

@@ -258,7 +258,7 @@ func createKubeConfigFileIfNotExists(outDir, filename string, config *clientcmda
 	// kubeadm doesn't validate the existing kubeconfig file more than this (kubeadm trusts the client certs to be valid)
 	// Basically, if we find a kubeconfig file with the same path; the same CA cert and the same server URL;
 	// kubeadm thinks those files are equal and doesn't bother writing a new file
-	fmt.Printf("[kubeconfig] Using existing up-to-date KubeConfig file: %q\n", filename)
+	fmt.Printf("[kubeconfig] Using existing up-to-date KubeConfig file: %q\n", kubeConfigFilePath)

 	return nil
 }