github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: Split out ClusterConfiguration from InitConfiguration

Browse Source 
Trivial rebasement, fixed some broken tests,
and inserted some TODOs: Rostislav M. Georgiev <rostislavg@vmware.com>
This commit is contained in:
Lucas Käldström
2018-08-10 21:30:54 +03:00
committed by Rostislav M. Georgiev
parent 405eecad6d
commit 5224551fa1
54 changed files with 1086 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,12 +55,15 @@ func SetupInitConfigurationFile(t *testing.T, tmpdir string, cfg *kubeadmapi.Ini
cfgTemplate := template.Must(template.New("init").Parse(dedent.Dedent(`
apiVersion: kubeadm.k8s.io/v1alpha3
kind: InitConfiguration
nodeRegistration:
name: {{.NodeRegistration.Name}}
---
apiVersion: kubeadm.k8s.io/v1alpha3
kind: ClusterConfiguration
certificatesDir: {{.CertificatesDir}}
api:
advertiseAddress: {{.API.AdvertiseAddress}}
bindPort: {{.API.BindPort}}
nodeRegistration:
name: {{.NodeRegistration.Name}}
kubernetesVersion: v1.10.0
`)))