mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 12:18:16 +00:00 
			
		
		
		
	Merge pull request #109572 from endocrimes/dani/remote-docker
e2e_node: remote runner: Require containerd/crio
This commit is contained in:
		@@ -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
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user