From 2c9c45ca4ed50ac6654cd8f96f5fda673b07e9a8 Mon Sep 17 00:00:00 2001
From: Matt Liggett <mml@google.com>
Date: Fri, 6 Oct 2017 15:03:03 -0700
Subject: [PATCH] Add client and server versions to the e2e.test output.

Fixes #53502.
---
 test/e2e/BUILD  |  1 +
 test/e2e/e2e.go | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index eab8eb65efb..76587ca9d03 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -60,6 +60,7 @@ go_library(
         "//pkg/controller/node:go_default_library",
         "//pkg/kubectl/util/logs:go_default_library",
         "//pkg/quota/evaluator/core:go_default_library",
+        "//pkg/version:go_default_library",
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/ginkgowrapper:go_default_library",
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index 00e1d561daa..b7d937d7b1b 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -38,6 +38,7 @@ import (
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
 	gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"k8s.io/kubernetes/pkg/kubectl/util/logs"
+	"k8s.io/kubernetes/pkg/version"
 	commontest "k8s.io/kubernetes/test/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
 	"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"
@@ -227,6 +228,19 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 		framework.LogContainersInPodsWithLabels(c, metav1.NamespaceSystem, framework.ImagePullerLabels, "nethealth", logFunc)
 	}
 
+	// Log the version of the server and this client.
+	framework.Logf("Client version: %s", version.Get().GitVersion)
+
+	dc := c.DiscoveryClient
+
+	serverVersion, serverErr := dc.ServerVersion()
+	if serverErr != nil {
+		framework.Logf("Unexpected server error retrieving version: %v", serverErr)
+	}
+	if serverVersion != nil {
+		framework.Logf("Server version: %s", serverVersion.GitVersion)
+	}
+
 	// Reference common test to make the import valid.
 	commontest.CurrentSuite = commontest.E2E