Merge pull request #21307 from wojtek-t/store_master_logs_in_kubemark

test/e2e/core.go

@@ -37,55 +37,61 @@ func CoreDump(dir string) {
 	}
 	provider := testContext.Provider
 
-	// requires ssh
-	if !providerIs(providersWithSSH...) {
+	// requires ssh to master machine
+	if !providerIs(providersWithMasterSSH...) {
 		fmt.Printf("Skipping SSH core dump, which is not implemented for %s", provider)
 		return
 	}
 
-	// Get all nodes' external IPs.
-	hosts, err := NodeSSHHosts(c)
+	// I wish there was a better way to get the master IP...
+	config, err := loadConfig()
 	if err != nil {
-		fmt.Printf("Error getting node hostnames: %v", err)
-		return
+		fmt.Printf("Error loading config: %v", err)
 	}
+	ix := strings.LastIndex(config.Host, "/")
+	master := net.JoinHostPort(config.Host[ix+1:], "22")
 
-	cmds := []command{{"cat /var/log/kube-proxy.log", "kube-proxy"}}
-	if isUsingSystemdKubelet(provider, hosts...) {
+	cmds := []command{
+		{"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"},
+	}
+	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"},
-			{"cat /var/log/dmesg", "dmesg"},
 		}...)
 	}
 
-	logCore(cmds, hosts, dir, provider)
+	logCore(cmds, []string{master}, dir, provider)
 
-	// I wish there was a better way to get the master IP...
-	config, err := loadConfig()
-	if err != nil {
-		fmt.Printf("Error loading config: %v", err)
+	// requires ssh
+	if !providerIs(providersWithSSH...) {
+		fmt.Printf("Skipping SSH core dump for nodes, which is not implemented for %s", provider)
+		return
 	}
-	ix := strings.LastIndex(config.Host, "/")
-	master := net.JoinHostPort(config.Host[ix+1:], "22")
 
-	cmds = []command{
-		{"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"},
+	// Get all nodes' external IPs.
+	hosts, err := NodeSSHHosts(c)
+	if err != nil {
+		fmt.Printf("Error getting node hostnames: %v", err)
+		return
 	}
-	if isUsingSystemdKubelet(provider, master) {
+
+	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/supervisor/supervisord.log", "supervisord"},
+			{"cat /var/log/dmesg", "dmesg"},
 		}...)
 	}
 
-	logCore(cmds, []string{master}, dir, provider)
+	logCore(cmds, hosts, dir, provider)
 }
 
 func logCore(cmds []command, hosts []string, dir, provider string) {

test/e2e/util.go

@@ -314,6 +314,9 @@ func SkipUnlessServerVersionGTE(v semver.Version, c client.ServerVersionInterfac
 // providersWithSSH are those providers where each node is accessible with SSH
 var providersWithSSH = []string{"gce", "gke", "aws"}
 
+// providersWithMasterSSH are those providers where master node is accessible with SSH
+var providersWithMasterSSH = []string{"gce", "gke", "kubemark", "aws"}
+
 type podCondition func(pod *api.Pod) (bool, error)
 
 // podReady returns whether pod has a condition of Ready with a status of true.