github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76918 from xichengliudui/cleanup-kubeadm-master

Browse Source 
kubeadm cleanup: master -> control-plane
This commit is contained in:
Kubernetes Prow Robot 2019-04-22 22:44:08 -07:00 committed by GitHub
commit 40f691a416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/test/util.go
View File

@ -45,9 +45,9 @@ func SetupTempDir(t *testing.T) string {
return tmpdir return tmpdir
} }
// SetupInitConfigurationFile is a utility function for kubeadm testing that writes a master configuration file // SetupInitConfigurationFile is a utility function for kubeadm testing that writes a InitConfiguration file
// into /config subfolder of a given temporary directory. // into /config subfolder of a given temporary directory.
// The function returns the path of the created master configuration file. // The function returns the path of the created InitConfiguration file.
func SetupInitConfigurationFile(t *testing.T, tmpdir string, cfg *kubeadmapi.InitConfiguration) string { func SetupInitConfigurationFile(t *testing.T, tmpdir string, cfg *kubeadmapi.InitConfiguration) string {
cfgPath := filepath.Join(tmpdir, "config/masterconfig.yaml") cfgPath := filepath.Join(tmpdir, "config/masterconfig.yaml")