github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 13:50:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109572 from endocrimes/dani/remote-docker

Browse Source 
e2e_node: remote runner: Require containerd/crio
This commit is contained in:
Kubernetes Prow Robot
2022-05-04 02:34:03 -07:00
committed by GitHub
parent a637604399 0e0e3113e2
commit 1347e560ec
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e_node/runner/remote/run_remote.go
View File

@@ -705,15 +705,14 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
var output string var output string
output, err = remote.SSH(name, "sh", "-c", output, err = remote.SSH(name, "sh", "-c",
"'systemctl list-units --type=service --state=running | grep -e docker -e containerd -e crio'") "'systemctl list-units --type=service --state=running | grep -e containerd -e crio'")
if err != nil { if err != nil {
err = fmt.Errorf("instance %s not running docker/containerd/crio daemon - Command failed: %s", name, output) err = fmt.Errorf("instance %s not running containerd/crio daemon - Command failed: %s", name, output)
continue continue
} }
if !strings.Contains(output, "docker.service") && if !strings.Contains(output, "containerd.service") &&
!strings.Contains(output, "containerd.service") &&
!strings.Contains(output, "crio.service") { !strings.Contains(output, "crio.service") {
err = fmt.Errorf("instance %s not running docker/containerd/crio daemon: %s", name, output) err = fmt.Errorf("instance %s not running containerd/crio daemon: %s", name, output)
continue continue
} }
instanceRunning = true instanceRunning = true