search

minikube-machine / machine

libmachine from github.com/docker/machine
Apache License 2.0
1 stars 5 forks source link

Cherry-pick fixes from gitlab-machine #9

Open afbjorklund opened 3 months ago

afbjorklund commented 3 months ago

https://gitlab.com/gitlab-org/ci-cd/docker-machine

Currently up to v0.16.2-gitlab.29 (since v0.16.2)

Mostly fixes for other drivers, but should look at libmachine...

Note: "We will maintain the fork and provide support through the end of the calendar year 2024."

 drivers/virtualbox/vbm.go                          |  30 +++++++++++++++---------------
 drivers/virtualbox/vbm_test.go                     |  19 +++++++++++++------
 drivers/virtualbox/vtx_intel.go                    |   1 +
 drivers/virtualbox/vtx_other.go                    |   1 +
 libmachine/drivers/plugin/localbinary/plugin.go    |   6 ++++--
 libmachine/libmachine.go                           |   3 +++
 libmachine/mcndockerclient/docker_client.go        |  30 ++++++++++++++++++++++--------
 libmachine/mcndockerclient/docker_versioner.go     |   7 +++++--
 libmachine/mcnutils/utils.go                       |  12 ++++++++----
 libmachine/provision/amzn.go                       |  25 +++++++++++++++++++++++++
 libmachine/provision/arch.go                       |   4 +++-
 libmachine/provision/boot2docker.go                |   8 +++++---
 libmachine/provision/configure_swarm.go            |  41 ++++++++++++++++++++---------------------
 libmachine/provision/coreos.go                     |   9 +++++----
 libmachine/provision/debian.go                     |   4 +++-
 libmachine/provision/fake_provisioner.go           |   2 ++
 libmachine/provision/generic.go                    |   4 ++++
 libmachine/provision/google_cos.go                 | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libmachine/provision/os_release.go                 |   1 +
 libmachine/provision/os_release_test.go            |  31 +++++++++++++++++++++++++++++++
 libmachine/provision/provisioner.go                |   3 +++
 libmachine/provision/provisiontest/sshcommander.go |  12 ++++++------
 libmachine/provision/rancheros.go                  |   5 +++--
 libmachine/provision/redhat.go                     |   4 +---
 libmachine/provision/suse.go                       |   4 +++-
 libmachine/provision/ubuntu_systemd.go             |  15 +++++++++++++--
 libmachine/provision/ubuntu_upstart.go             |   4 +---
 libmachine/provision/utils.go                      |  17 ++++++++++++++++-
 libmachine/shell/shell.go                          |   1 +
 libmachine/shell/shell_unix_test.go                |   1 +
 libmachine/ssh/client.go                           |  12 ++++++------
 version/version.go                                 |   2 +-
 32 files changed, 365 insertions(+), 92 deletions(-)

Most of the provisioner changes don't affect minikube-machine.

afbjorklund commented 1 month ago

Mostly about Go versions and Docker versions, that are bumped by minikube anyway.

f9f13f0f Upgrade Go to 1.21.1
02f85e4f Use official Docker client
c48e05e6 Migrate from docker/pkg/term to golang.org/x/term
86b19316 Fix provisioning for recent Docker versions
9460ab97 Add docker restart to machine provisioning
b84e7ffe update test fail message to match with osr
bf2ece34 add CPE_NAME in OsRelease to support Amazon Linux 2
c7749fd2 Allow provisioning to Amazon linux
99e0e6fe Restart, not start docker after setting up auth
be85446b Add support for Container Optimized OS
e927003b provision: fix flatcar detection in coreos
5050ac2b Save machine when create fails
fa13d6b3 Make DigitalOcean driver RateLimit aware