Merge pull request #46565 from hex108/exit_kubemark

Automatic merge from submit-queue Let kubemark exit if it fails to start Fix the bug: If there is sth wrong to run hollow kubelet, kubemark will just hang instead of exiting. I came across the problem when I tried to start kubemark with no-root user. ``` I0523 15:27:39.721447 16855 docker_service.go:223] Setting cgroupDriver to cgroupfs I0523 15:27:39.721634 16855 docker_legacy.go:151] No legacy containers found, stop performing legacy cleanup. I0523 15:27:39.722208 16855 kubelet.go:559] Starting the GRPC server for the docker CRI shim. I0523 15:27:39.722228 16855 docker_server.go:60] Start dockershim grpc server I0523 15:27:39.722265 16855 server.go:819] failed to unlink socket file "/var/run/dockershim.sock": permission denied E0523 15:27:39.722327 16855 container_manager_linux.go:98] Unable to ensure the docker processes run in the desired containers ```

Merge pull request #46565 from hex108/exit_kubemark
eeda8922 · Kubernetes Submit Queue · GitHub · 451d0a43 · c3da0503 · eeda8922
Commit eeda8922 authored May 29, 2017 by Kubernetes Submit Queue Committed by GitHub May 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

hollow_kubelet.go pkg/kubemark/hollow_kubelet.go +3 -1

No files found.
--- a/pkg/kubemark/hollow_kubelet.go
+++ b/pkg/kubemark/hollow_kubelet.go
@@ -89,7 +89,9 @@ func NewHollowKubelet(
 // Starts this HollowKubelet and blocks.
 func (hk *HollowKubelet) Run() {
-	kubeletapp.RunKubelet(hk.KubeletFlags, hk.KubeletConfiguration, hk.KubeletDeps, false, false)
+	if err := kubeletapp.RunKubelet(hk.KubeletFlags, hk.KubeletConfiguration, hk.KubeletDeps, false, false); err != nil {
+		glog.Fatalf("Failed to run HollowKubelet: %v. Exiting.", err)
+	}
 	select {}
 }