Commit Graph

27 Commits (62c0d53b7de3e40b6981d2125e00595628547022)

Author SHA1 Message Date
Anders F Björklund a73dfc5f9e Merge branch 'master' into cyclo 2019-04-12 20:03:20 +02:00
Jan Janik e3cd27264d Escape systemd special chars in —docker-env 2019-03-29 16:56:51 +13:00
Anders F Björklund 4667c28164 Merge branch 'master' into cyclo 2019-03-26 07:16:28 +01:00
Anders F Björklund 00c9846a19 Decrease cyclomatic complexity for code
Mostly by using the "extract method" pattern.

Here was the report (from gocyclo), before:

16 kubeadm (*KubeadmBootstrapper).UpdateCluster pkg/minikube/bootstrapper/kubeadm/kubeadm.go:374:1
16 cluster StartHost pkg/minikube/cluster/cluster.go:64:1
16 tunnel setupRoute pkg/minikube/tunnel/tunnel.go:135:1
16 provision configureAuth pkg/provision/buildroot.go:218:1
21 util setElement pkg/util/config.go:50:1
2019-03-16 22:18:14 +01:00
Anders F Björklund edf46f003f Document all exported functions outside minikube 2019-03-16 16:57:37 +01:00
Anders F Björklund 6f909684e7 Still generate docker.service unit, even if unused
The dynamically generated docker.service file should still be there,
otherwise the statically provided docker.socket file gets confused.
2019-01-20 15:22:37 +01:00
priyawadhwa ed8f7124a0 Only restart docker service if container runtime is docker (#3426)
* Only restart docker service if container runtime is docker

Only allow the buildroot provisioner to restart docker if the container
runtime is docker. This change should fix the bug in #3424, since now
docker will not be restarted if the container runtime is containerd.

* Added files to fix FileContent--proc-sys-net-bridge-bridge-nf-call-iptables precheck error

From this issue: https://github.com/kubernetes/kubeadm/issues/1062
these files need to be added to prevent this precheck error (which occurs when running any container runtime that isn't docker).

Also, save the machine config on the user's filesystem earlier so that the buildprovisioner can access it.
2018-12-07 12:08:59 -08:00
Balint Pato a681603daa
Fix `minikube tunnel` for hyperkit (#3349)
This change is a bit of a hack to make IP routing work over the virtio-net interface - it forces the virtio-net interface (bridge100) created by hyperkit/xhyve to reset via removing and readding the single member of the interface. Without this "reset" packets are just simply lost most of the time, despite a completely healthy IP route.

This error was also the reason for a large percentage of our integration test failures. While reducing the flakiness of tunnel related tests I also increased the timeout requirement and adding retries to the nginx request in TestTunnel.
2018-11-21 13:39:48 -08:00
Thomas Stromberg 055c8002b1 Replace %s format directives with %v for errors.
Previously we were mixed between the two forms. This commit picks %v,
which is consistent with the Kubernetes code base. They both effectively
do the same thing in this case, though %v works with any object, and %s
only with string objects.
2018-09-28 16:05:27 -07:00
dlorenc 9fe9154614 Make a crio restart failure a warning instead of an error.
This is a mismatch issue between new minikube versions and old ISO versions. It's
also unlikely to cause a real issue because it requires users to opt-into crio and
modify crio-specific settings to cause trouble.
2018-02-15 11:52:24 -08:00
Matt Rickard a2665d0dd8
Merge pull request #2545 from jeis2497052/master
Propose fix a typo
2018-02-13 13:49:44 -08:00
John Eismeier 7f3a46bfb3
Propose fix a typo 2018-02-13 14:48:11 -05:00
Yongkun Anfernee Gui c07258b45a Fix more permissions 2018-02-09 14:32:53 -08:00
Anders F Björklund 0e674ef3fa Make sure to enable docker, to please kubeadm
The kubeadm preflight looks if the docker service is enabled,
rather than checking the docker socket... So make it happy.
2018-02-05 09:17:19 -08:00
Matt Rickard c7f03444b5 Merge branch 'master' into docker-17.05 2017-10-19 07:23:11 -07:00
Vincent Batts 50570f6133
buildroot: output flags for crio
This adds an environment variable file for crio.service to source.
And a step for the buildroot provisioner to write flags, initially just
insecure-registry.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-10-17 13:39:06 -04:00
Aaron Prindle e575585c2c fixed path errors on windows, replaced filepath w/ path 2017-09-14 11:21:27 -07:00
Matt Rickard fd37e6daec Move setupCerts to use CommandRunners 2017-08-23 14:33:34 -07:00
dlorenc 9b2dd165b3 Restart docker after configuration. 2017-08-21 18:00:13 -07:00
Matt Rickard 0db44af93c Rewrite configureAuth
The current implementation assumes that we already have docker running.
 This switches it to not remove any previous docker configuration
(since there isn't any), and uses our native file transfer utils
instead of the printf commands.
2017-08-20 22:44:19 -07:00
Bryan Larsen 4022957d78 docker daemon must be started as 'dockerd' in newer versions of docker 2017-08-01 11:33:19 -04:00
Mike Grass 7cc510e180 Document the `ExecStart=` behavior for the dockerd config 2017-04-10 04:38:14 -07:00
Mike Grass 6cd08d4756 Update systemd docker config to clear ExecStart
docker/machine made a change (https://github.com/docker/machine/pull/3966) to use a systemd drop-in unit (https://coreos.com/os/docs/latest/using-systemd-drop-in-units.html) instead of overwriting the dockerd configuration. This necessitates clearing the ExecStart list inherited from the base config prior to the ExecStart directive in GenerateDockerOptions -- otherwise, docker.service fails to start with log output like "docker.service: Service has more than one ExecStart= setting, which is only allowed for Type=oneshot services. Refusing."
2017-04-07 12:39:21 -07:00
Matt Rickard b72efef48d Retry for configureAuth on minikube start
Sometimes the docker daemon isn't ready and on a restart and libmachine
times out while trying to reach it.  This retries when it isn't ready.

This fixes timeout problems in our virtualbox integration tests.
2016-11-21 13:32:34 -08:00
dlorenc d23a7a53a8 Add docker-env options to the buildroot provisioner. 2016-10-27 15:07:34 -07:00
Jimmi Dyson 82cb28918f
Use text/template for buildroot provision template 2016-10-17 10:00:43 +01:00
Sergiusz Urbaniak 3945c3bffb
localkube: add rkt, and CNI support 2016-09-09 13:48:22 +02:00