From 38514f1b68294d60688479aba97306a504aeb5e6 Mon Sep 17 00:00:00 2001
From: Piotr Szczesniak <pszczesniak@google.com>
Date: Thu, 24 Nov 2016 12:21:12 +0100
Subject: [PATCH] Bumped supported Kubernetes version in integration tests

---
 Makefile                         |  2 +-
 integration/.jenkins.sh          |  2 +-
 integration/heapster_api_test.go | 16 +++++++++++-----
 metrics/sinks/manager_test.go    |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d1574a23fe..295fa545c7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ TAG = v1.2.0
 PREFIX = gcr.io/google_containers
 FLAGS = 
 
-SUPPORTED_KUBE_VERSIONS = "1.3.6"
+SUPPORTED_KUBE_VERSIONS = "1.4.6"
 TEST_NAMESPACE = heapster-e2e-tests
 
 deps:
diff --git a/integration/.jenkins.sh b/integration/.jenkins.sh
index 4baa47a678..3dd88e9b08 100755
--- a/integration/.jenkins.sh
+++ b/integration/.jenkins.sh
@@ -7,7 +7,7 @@ export GOBIN="$GOPATH/bin"
 export PATH="$GOBIN:$PATH"
 
 # Kubernetes version(s) to run the integration tests against.
-kube_version="1.3.6"
+kube_version="1.4.6"
 
 if ! git diff --name-only origin/master | grep -c -E "*.go|*.sh|.*yaml|Makefile" &> /dev/null; then
   echo "This PR does not touch files that require integration testing. Skipping integration tests!"
diff --git a/integration/heapster_api_test.go b/integration/heapster_api_test.go
index 3de35808fe..0daf93b300 100644
--- a/integration/heapster_api_test.go
+++ b/integration/heapster_api_test.go
@@ -224,15 +224,21 @@ func getSchema(fm kubeFramework, svc *kube_api.Service) (*api_v1.TimeseriesSchem
 }
 
 var expectedSystemContainers = map[string]struct{}{
-	"machine":       {},
-	"kubelet":       {},
-	"kube-proxy":    {},
-	"system":        {},
+	"machine":    {},
+	"kubelet":    {},
+	"kube-proxy": {},
+	// TODO(piosz): Uncomment once https://github.com/kubernetes/kubernetes/issues/37453 is fixed
+	// "system":        {},
 	"docker-daemon": {},
 }
 
 func isContainerBaseImageExpected(ts *api_v1.Timeseries) bool {
-	_, exists := expectedSystemContainers[ts.Labels[core.LabelContainerName.Key]]
+	cName := ts.Labels[core.LabelContainerName.Key]
+	// TODO(piosz): remove this if once https://github.com/kubernetes/kubernetes/issues/37453 is fixed
+	if cName == "system" {
+		return false
+	}
+	_, exists := expectedSystemContainers[cName]
 	return !exists
 }
 
diff --git a/metrics/sinks/manager_test.go b/metrics/sinks/manager_test.go
index 931407d513..428535a1ec 100644
--- a/metrics/sinks/manager_test.go
+++ b/metrics/sinks/manager_test.go
@@ -42,7 +42,7 @@ func TestAllExportsInTime(t *testing.T) {
 	manager.ExportData(&batch)
 
 	elapsed := time.Now().Sub(now)
-	if elapsed > 2*timeout+2*time.Second {
+	if elapsed > 3*timeout+2*time.Second {
 		t.Fatalf("3xExportData took too long: %s", elapsed)
 	}