github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

kubeadm cleanup: master -> control-plane
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-22 22:44:08 -07:00 committed by GitHub
parent 4ec29a1a2b 81c30cbeb0
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
}
// 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.
// 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 {
cfgPath := filepath.Join(tmpdir, "config/masterconfig.yaml")