Merge pull request #19306 from yifan-gu/kubelet_service_e2e

Auto commit by PR queue bot

test/e2e/core.go

@@ -50,11 +50,16 @@ func CoreDump(dir string) {
 		return
 	}
 
-	cmds := []command{
+	cmds := []command{{"cat /var/log/kube-proxy.log", "kube-proxy"}}
+	if isUsingSystemdKubelet(provider, hosts...) {
+		cmds = append(cmds, command{"sudo journalctl --output=cat -u kubelet.service", "kubelet"})
+	} else {
+		cmds = append(cmds, []command{
 			{"cat /var/log/kubelet.log", "kubelet"},
-		{"cat /var/log/kube-proxy.log", "kube-proxy"},
 			{"cat /var/log/supervisor/supervisord.log", "supervisord"},
+		}...)
 	}
+
 	logCore(cmds, hosts, dir, provider)
 
 	// I wish there was a better way to get the master IP...
@@ -64,13 +69,21 @@ func CoreDump(dir string) {
 	}
 	ix := strings.LastIndex(config.Host, "/")
 	master := net.JoinHostPort(config.Host[ix+1:], "22")
+
 	cmds = []command{
-		{"cat /var/log/kubelet.log", "kubelet"},
 		{"cat /var/log/kube-apiserver.log", "kube-apiserver"},
 		{"cat /var/log/kube-scheduler.log", "kube-scheduler"},
 		{"cat /var/log/kube-controller-manager.log", "kube-controller-manager"},
-		{"cat /var/log/supervisor/supervisord.log", "supervisord"},
 	}
+	if isUsingSystemdKubelet(provider, master) {
+		cmds = append(cmds, command{"sudo journalctl --output=cat -u kubelet.service", "kubelet"})
+	} else {
+		cmds = append(cmds, []command{
+			{"cat /var/log/kubelet.log", "kubelet"},
+			{"cat /var/log/supervisor/supervisord.log", "supervisord"},
+		}...)
+	}
+
 	logCore(cmds, []string{master}, dir, provider)
 }
 
@@ -97,3 +110,32 @@ func logCore(cmds []command, hosts []string, dir, provider string) {
 	}
 	wg.Wait()
 }
+
+func isUsingSystemdKubelet(provider string, hosts ...string) bool {
+	wg := &sync.WaitGroup{}
+	results := make([]bool, len(hosts))
+	cmd := "sudo systemctl status kubelet.service"
+
+	wg.Add(len(hosts))
+	for i := range hosts {
+		go func(i int) {
+			defer wg.Done()
+			result, err := SSH(cmd, hosts[i], provider)
+			if err != nil {
+				fmt.Printf("Error running command: %v\n", err)
+				return
+			}
+			if result.Code == 0 {
+				results[i] = true
+			}
+		}(i)
+	}
+	wg.Wait()
+
+	for _, r := range results {
+		if r {
+			return true
+		}
+	}
+	return false
+}