From 4f1818c3cd765417d5893f00b5b5e9cc5ca8c5e8 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Mon, 27 Nov 2017 10:05:26 -0500
Subject: [PATCH] Include ServerName in tls transport cache key

Kubernetes-commit: d054aaf4612ac80dc11d22b1a341fb9c926e234f
---
 transport/cache.go      |  2 +-
 transport/cache_test.go | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/transport/cache.go b/transport/cache.go
index 8d76def34..a3d7c19dd 100644
--- a/transport/cache.go
+++ b/transport/cache.go
@@ -84,5 +84,5 @@ func tlsConfigKey(c *Config) (string, error) {
 		return "", err
 	}
 	// Only include the things that actually affect the tls.Config
-	return fmt.Sprintf("%v/%x/%x/%x", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData), nil
+	return fmt.Sprintf("%v/%x/%x/%x/%v", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData, c.TLS.ServerName), nil
 }
diff --git a/transport/cache_test.go b/transport/cache_test.go
index eb9624d7e..81f428de0 100644
--- a/transport/cache_test.go
+++ b/transport/cache_test.go
@@ -62,6 +62,20 @@ func TestTLSConfigKey(t *testing.T) {
 				KeyData:  []byte{1},
 			},
 		},
+		"cert 1, key 1, servername 1": {
+			TLS: TLSConfig{
+				CertData:   []byte{1},
+				KeyData:    []byte{1},
+				ServerName: "1",
+			},
+		},
+		"cert 1, key 1, servername 2": {
+			TLS: TLSConfig{
+				CertData:   []byte{1},
+				KeyData:    []byte{1},
+				ServerName: "2",
+			},
+		},
 		"cert 1, key 2": {
 			TLS: TLSConfig{
 				CertData: []byte{1},