[WIP] Kubeadm bootstrapper #1825

r2d4 · 2017-08-16T04:52:28Z

Some TODOs

Make custom storage provisioner work with the kubeadm bootstrapper. Currently it doesn't since we run it directly in localkube. I've skipped that particular integration test right now.
Implement the "extra config" with the kubeadm config file
Use an upstream version of kubeadm once one is released with the phase alpha controlplane command. This was recently merged.
Status should check the status of the apiserver. Currently it just checks the status of the kubelet
Logs should return logs of all the components of the control plane.

TODOs probably in scope for this PR

Add unit tests
Handle the none driver. There are a few obvious fixes needed, but I haven't done any extensive testing.
Figure out a persisted place for the etcd data directory (I just stuck it in /data)

codecov-io · 2017-08-16T17:53:05Z

Codecov Report

Merging #1825 into master will decrease coverage by 5.66%.
The diff coverage is 24.7%.

@@            Coverage Diff             @@
##           master    #1825      +/-   ##
==========================================
- Coverage   36.25%   30.58%   -5.67%     
==========================================
  Files          51       70      +19     
  Lines        3462     4162     +700     
==========================================
+ Hits         1255     1273      +18     
- Misses       2024     2716     +692     
+ Partials      183      173      -10

Impacted Files	Coverage Δ
pkg/util/constants.go	`0% <ø> (ø)`	⬆️
cmd/minikube/cmd/config/config.go	`39.28% <ø> (ø)`
pkg/minikube/bootstrapper/exec_runner.go	`0% <0%> (ø)`
cmd/minikube/cmd/logs.go	`14.28% <0%> (-4.47%)`	⬇️
pkg/minikube/bootstrapper/runner.go	`0% <0%> (ø)`
cmd/minikube/cmd/config/util.go	`19.31% <0%> (ø)`
pkg/minikube/bootstrapper/ssh_runner.go	`0% <0%> (ø)`
cmd/minikube/cmd/status.go	`8.62% <0%> (-0.64%)`	⬇️
pkg/minikube/sshutil/sshutil.go	`19.11% <0%> (-26.25%)`	⬇️
pkg/util/downloader.go	`64.28% <100%> (ø)`	⬆️
... and 31 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1d715bf...9926776. Read the comment docs.

The command runner is a common interface for both commands ran on the host and ssh commands. Thsi way, the bootstrapper can set up the cluster, unaware of the vm-driver being a hypervisor or none.

aaron-prindle · 2017-08-18T17:27:20Z

cmd/minikube/cmd/config/config.go

@@ -114,6 +116,10 @@ var settings = []Setting{
 		set:  SetString,
 	},
 	{
+		name: Bootstrapper,
+		set:  SetString, //TODO(r2d4): more validation here?


Perhaps validation function here that checks against a list of available bootstrappers

nkubala · 2017-08-18T17:55:08Z

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

+}
+
+func (k *KubeadmBootstrapper) RestartCluster(k8s bootstrapper.KubernetesConfig) error {
+	if err := k.c.Run("rm -rf /etc/kubernets/*.conf"); err != nil {


should this be /etc/kubernetes/*.conf?

Good catch. Maybe I can remove this if it wasn't doing anything

r2d4 · 2017-08-18T18:10:13Z

pkg/minikube/bootstrapper/localkube/localkube_test.go

+			description: "logs -f",
+			follow:      true,
+		},
+		// TODO(r2d4): fix this test


r2d4 · 2017-08-18T18:14:06Z

pkg/minikube/constants/constants.go

@@ -135,11 +136,31 @@ const (
 )

 const (
+	KubeletServiceFile     = "/lib/systemd/system/kubelet.service"
+	KubeletSystemdConfFile = "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
+	KubeadmConfigFile      = "/var/lib/kubeadm.yaml"


put in /etc/kubernetes

r2d4 · 2017-08-18T18:19:57Z

pkg/minikube/sshutil/sshutil.go

-func DeleteFile(f assets.CopyableFile, client *ssh.Client) error {
-	return RunCommand(client, GetDeleteFileCommand(f))
-}
+func GetShell(session *ssh.Session, cmd string) error {


Do we actually need this

r2d4 · 2017-08-18T18:20:24Z

pkg/minikube/sshutil/sshutil.go

 )

-// SSHSession provides methods for running commands on a host.
-type SSHSession interface {


Where was this used?

r2d4 · 2017-08-18T18:21:17Z

pkg/minikube/sshutil/sshutil_test.go

-}
+//TODO(r2d4): Move this test to bootstrapper package
+
+// func TestNewSSHClient(t *testing.T) {


MHBauer · 2017-08-30T23:22:57Z

Is there something I can do to help/test?

For context: I mainly use https://github.com/Mirantis/kubeadm-dind-cluster as it is very helpful to be able to get a git HEAD dev version of kubernetes up and running with a bunch of sane defaults.

r2d4 · 2017-08-30T23:45:01Z

@minikube-bot retest this please

r2d4 · 2017-08-30T23:46:11Z

This branch is a bit out of a date now - as I split most of the changes into smaller PRs (command runner, localkube bootstrapped). The last part of this is just splitting out the kubeadm changes to a new PR, which I should hopefully get to soon. I've just been a bit busy with other things.

r2d4 · 2017-08-31T00:44:18Z

I've rebased and opened up #1903

r2d4 added 8 commits August 14, 2017 21:38

Split out localkube commands to interface

23eaee7

Add experimental kubeadm bootstrapper

c56149c

Kubeadm restart

2e78763

Implement kubeadm restart cluster

7e26c24

Untaint master node to make it schedulable

5e00cef

Implement some more of the kubeadm bootstrapper

21ff37e

Add integration tests for kubeadm

3e83023

Fix tests

74fc0c8

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 16, 2017

r2d4 force-pushed the kubeadm-bootstrapper branch from bb49c11 to ed66cd3 Compare August 16, 2017 05:13

godeps

384bc9b

r2d4 force-pushed the kubeadm-bootstrapper branch from ed66cd3 to 384bc9b Compare August 16, 2017 17:10

r2d4 added 2 commits August 16, 2017 22:16

Add command runner

45d6432

The command runner is a common interface for both commands ran on the host and ssh commands. Thsi way, the bootstrapper can set up the cluster, unaware of the vm-driver being a hypervisor or none.

Fix tests, add boilerplate

9280509

r2d4 force-pushed the kubeadm-bootstrapper branch 2 times, most recently from 5969a13 to 6649952 Compare August 17, 2017 22:16

Integration test tweaks

9926776

r2d4 force-pushed the kubeadm-bootstrapper branch from 6649952 to 9926776 Compare August 17, 2017 23:10

aaron-prindle reviewed Aug 18, 2017

View reviewed changes

nkubala reviewed Aug 18, 2017

View reviewed changes

r2d4 commented Aug 18, 2017

View reviewed changes

r2d4 mentioned this pull request Aug 31, 2017

Kubeadm bootstrapper #1903

Merged

r2d4 closed this Aug 31, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Kubeadm bootstrapper #1825

[WIP] Kubeadm bootstrapper #1825

r2d4 commented Aug 16, 2017 •

edited

Loading

codecov-io commented Aug 16, 2017 •

edited

Loading

aaron-prindle Aug 18, 2017

nkubala Aug 18, 2017

r2d4 Aug 18, 2017

r2d4 Aug 18, 2017

r2d4 Aug 18, 2017

r2d4 Aug 18, 2017

r2d4 Aug 18, 2017

r2d4 Aug 18, 2017

MHBauer commented Aug 30, 2017

r2d4 commented Aug 30, 2017

r2d4 commented Aug 30, 2017

r2d4 commented Aug 31, 2017

[WIP] Kubeadm bootstrapper #1825

[WIP] Kubeadm bootstrapper #1825

Conversation

r2d4 commented Aug 16, 2017 • edited Loading

codecov-io commented Aug 16, 2017 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MHBauer commented Aug 30, 2017

r2d4 commented Aug 30, 2017

r2d4 commented Aug 30, 2017

r2d4 commented Aug 31, 2017

r2d4 commented Aug 16, 2017 •

edited

Loading

codecov-io commented Aug 16, 2017 •

edited

Loading