Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for cri-dockerd & dockerd runtimes when using none-driver on Kubernetes 1.24+ #14555

Merged
merged 14 commits into from
Jul 28, 2022
Merged

Check for cri-dockerd & dockerd runtimes when using none-driver on Kubernetes 1.24+ #14555

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
66957ea
None-driver: check cri-dockerd & dockerd runtimes
klaases Jul 11, 2022
eb64361
Always check for docker ahead of cri-dockerd
klaases Jul 11, 2022
50c75e9
Ensure k8s ver >= 1.24 for dockerd and cri-dockerd
klaases Jul 14, 2022
a7dc443
reason codes for not found cri-dockerd and dockerd
klaases Jul 22, 2022
1ec4a14
add check for none driver
klaases Jul 22, 2022
237e21b
exit if required cri-dockerd/dockerd are not found
klaases Jul 22, 2022
8f3ffb6
correct dockerd installation instructions
klaases Jul 25, 2022
5229143
add line break before: "💡 Suggestion ..."
klaases Jul 25, 2022
6118165
apply lowercase trailing "d's"
klaases Jul 25, 2022
7b8dc1c
Revert "remove error messaging from cruntime library"
klaases Jul 25, 2022
2db1b36
Revert "Add installtion instructions URLs"
klaases Jul 25, 2022
23b66e5
add "and the docker container-runtime"
klaases Jul 28, 2022
f5b83d4
add "and the docker container-runtime" for dockerd
klaases Jul 28, 2022
14ba826
add check for docker container-runtime
klaases Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions pkg/minikube/cruntime/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,17 @@ func (r *Docker) SocketPath() string {

// Available returns an error if it is not possible to use this runtime on a host
func (r *Docker) Available() error {
_, err := exec.LookPath("docker")
return err
var err error
if _, err = exec.LookPath("docker"); err != nil {
return err
}
if _, err = exec.LookPath("cri-dockerd"); err == nil {
klaases marked this conversation as resolved.
Show resolved Hide resolved
return nil
}
if _, err = exec.LookPath("dockerd"); err == nil {
klaases marked this conversation as resolved.
Show resolved Hide resolved
return nil
}
return errors.New("runtimes were not found: cri-dockerd, dockerd")
}

// Active returns if docker is active on the host
Expand Down