Bumping k8s dependencies to 1.13

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/BUILD

@@ -13,13 +13,14 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/test/e2e/instrumentation/logging",
     deps = [
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/instrumentation/common:go_default_library",
         "//test/e2e/instrumentation/logging/elasticsearch:go_default_library",
         "//test/e2e/instrumentation/logging/stackdriver:go_default_library",
+        "//test/utils/image:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/elasticsearch/BUILD

@@ -15,15 +15,15 @@ go_library(
     importpath = "k8s.io/kubernetes/test/e2e/instrumentation/logging/elasticsearch",
     deps = [
         "//pkg/apis/core:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/instrumentation/common:go_default_library",
         "//test/e2e/instrumentation/logging/utils:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/generic_soak.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
 	instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
+	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
 var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disruptive]", func() {
@@ -69,11 +70,12 @@ var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disrupti
 		wg.Add(scale)
 		for i := 0; i < scale; i++ {
 			go func() {
+				defer wg.Done()
+				defer GinkgoRecover()
 				wave := fmt.Sprintf("wave%v", strconv.Itoa(i))
 				framework.Logf("Starting logging soak, wave = %v", wave)
 				RunLogPodsWithSleepOf(f, kbRateInSeconds, wave, totalLogTime)
 				framework.Logf("Completed logging soak, wave %v", i)
-				wg.Done()
 			}()
 			// Niceness.
 			time.Sleep(millisecondsBetweenWaves)
@@ -100,7 +102,7 @@ func RunLogPodsWithSleepOf(f *framework.Framework, sleep time.Duration, podname
 			return v1.PodSpec{
 				Containers: []v1.Container{{
 					Name:  "logging-soak",
-					Image: "busybox",
+					Image: imageutils.GetE2EImage(imageutils.BusyBox),
 					Args: []string{
 						"/bin/sh",
 						"-c",

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/stackdriver/BUILD

@@ -14,6 +14,9 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/test/e2e/instrumentation/logging/stackdriver",
     deps = [
+        "//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/instrumentation/common:go_default_library",
         "//test/e2e/instrumentation/logging/utils:go_default_library",
@@ -21,9 +24,6 @@ go_library(
         "//vendor/golang.org/x/oauth2/google:go_default_library",
         "//vendor/google.golang.org/api/logging/v2beta1:go_default_library",
         "//vendor/google.golang.org/api/pubsub/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/json:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/stackdriver/basic.go

@@ -42,7 +42,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging implemented by Stackd
 		framework.SkipUnlessProviderIs("gce", "gke")
 	})
 
-	ginkgo.It("should ingest logs", func() {
+	ginkgo.It("should ingest logs [Feature:StackdriverLogging]", func() {
 		withLogProviderForScope(f, podsScope, func(p *sdLogProvider) {
 			ginkgo.By("Checking ingesting text logs", func() {
 				pod, err := utils.StartAndReturnSelf(utils.NewRepeatingLoggingPod("synthlogger-1", "hey"), f)
@@ -138,7 +138,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging implemented by Stackd
 		})
 	})
 
-	ginkgo.It("should ingest events", func() {
+	ginkgo.It("should ingest events [Feature:StackdriverLogging]", func() {
 		eventCreationInterval := 10 * time.Second
 
 		withLogProviderForScope(f, eventsScope, func(p *sdLogProvider) {

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/utils/BUILD

@@ -18,15 +18,15 @@ go_library(
     importpath = "k8s.io/kubernetes/test/e2e/instrumentation/logging/utils",
     deps = [
         "//pkg/apis/core:go_default_library",
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
+        "//staging/src/k8s.io/client-go/util/integer:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/utils/image:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
-        "//vendor/k8s.io/client-go/util/integer:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/test/e2e/instrumentation/logging/utils/logging_pod.go

@@ -177,7 +177,7 @@ func (p *execLoggingPod) Start(f *framework.Framework) error {
 			Containers: []api_v1.Container{
 				{
 					Name:    loggingContainerName,
-					Image:   "busybox",
+					Image:   imageutils.GetE2EImage(imageutils.BusyBox),
 					Command: p.cmd,
 					Resources: api_v1.ResourceRequirements{
 						Requests: api_v1.ResourceList{

vendor/k8s.io/kubernetes/test/e2e/instrumentation/monitoring/BUILD

@@ -12,7 +12,6 @@ go_library(
         "cadvisor.go",
         "custom_metrics_deployments.go",
         "custom_metrics_stackdriver.go",
-        "influxdb.go",
         "metrics_grabber.go",
         "prometheus.go",
         "stackdriver.go",
@@ -20,31 +19,32 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/test/e2e/instrumentation/monitoring",
     deps = [
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
+        "//staging/src/k8s.io/api/rbac/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/selection:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//staging/src/k8s.io/client-go/discovery:go_default_library",
+        "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
+        "//staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1:go_default_library",
+        "//staging/src/k8s.io/metrics/pkg/client/custom_metrics:go_default_library",
+        "//staging/src/k8s.io/metrics/pkg/client/external_metrics:go_default_library",
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/metrics:go_default_library",
         "//test/e2e/instrumentation/common:go_default_library",
         "//test/e2e/scheduling:go_default_library",
         "//test/utils/image:go_default_library",
-        "//vendor/github.com/influxdata/influxdb/client/v2:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/github.com/prometheus/common/model:go_default_library",
         "//vendor/golang.org/x/oauth2/google:go_default_library",
         "//vendor/google.golang.org/api/monitoring/v3:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
-        "//vendor/k8s.io/api/rbac/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/selection:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//vendor/k8s.io/client-go/discovery:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
-        "//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library",
-        "//vendor/k8s.io/metrics/pkg/client/external_metrics:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/test/e2e/instrumentation/monitoring/accelerator.go

@@ -74,9 +74,6 @@ func testStackdriverAcceleratorMonitoring(f *framework.Framework) {
 
 	scheduling.SetupNVIDIAGPUNode(f, false)
 
-	// TODO: remove this after cAdvisor race is fixed.
-	time.Sleep(time.Minute)
-
 	f.PodClient().Create(&v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: rcName,

vendor/k8s.io/kubernetes/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go

@@ -173,7 +173,7 @@ func stackdriverExporterContainerSpec(name string, namespace string, metricName
 }
 
 // PrometheusExporterDeployment is a Deployment of simple application with two containers
-// one exposing a metric in prometheus fromat and second a prometheus-to-sd container
+// one exposing a metric in prometheus format and second a prometheus-to-sd container
 // that scrapes the metric and pushes it to stackdriver.
 func PrometheusExporterDeployment(name, namespace string, replicas int32, metricValue int64) *extensions.Deployment {
 	return &extensions.Deployment{
@@ -211,7 +211,7 @@ func prometheusExporterPodSpec(metricName string, metricValue int64, port int32)
 			},
 			{
 				Name:            "prometheus-to-sd",
-				Image:           "k8s.gcr.io/prometheus-to-sd:v0.2.3",
+				Image:           "k8s.gcr.io/prometheus-to-sd:v0.3.1",
 				ImagePullPolicy: corev1.PullPolicy("Always"),
 				Command: []string{"/monitor", fmt.Sprintf("--source=:http://localhost:%d", port),
 					"--stackdriver-prefix=custom.googleapis.com", "--pod-id=$(POD_ID)", "--namespace-id=$(POD_NAMESPACE)"},

vendor/k8s.io/kubernetes/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go

@@ -29,11 +29,13 @@ import (
 
 	gcm "google.golang.org/api/monitoring/v3"
 	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/client-go/discovery"
 	"k8s.io/kubernetes/test/e2e/framework"
+	cmv1beta1 "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1"
 	customclient "k8s.io/metrics/pkg/client/custom_metrics"
 	externalclient "k8s.io/metrics/pkg/client/external_metrics"
 )
@@ -57,8 +59,10 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
 		if err != nil {
 			framework.Failf("Failed to load config: %s", err)
 		}
-		customMetricsClient := customclient.NewForConfigOrDie(config)
 		discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config)
+		apiVersionsGetter := customclient.NewAvailableAPIsGetter(discoveryClient)
+		restMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{cmv1beta1.SchemeGroupVersion})
+		customMetricsClient := customclient.NewForConfig(config, restMapper, apiVersionsGetter)
 		testCustomMetrics(f, kubeClient, customMetricsClient, discoveryClient, AdapterForOldResourceModel)
 	})
 
@@ -68,8 +72,10 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
 		if err != nil {
 			framework.Failf("Failed to load config: %s", err)
 		}
-		customMetricsClient := customclient.NewForConfigOrDie(config)
 		discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config)
+		apiVersionsGetter := customclient.NewAvailableAPIsGetter(discoveryClient)
+		restMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{cmv1beta1.SchemeGroupVersion})
+		customMetricsClient := customclient.NewForConfig(config, restMapper, apiVersionsGetter)
 		testCustomMetrics(f, kubeClient, customMetricsClient, discoveryClient, AdapterForNewResourceModel)
 	})
 
@@ -109,7 +115,10 @@ func testCustomMetrics(f *framework.Framework, kubeClient clientset.Interface, c
 	defer CleanupAdapter(adapterDeployment)
 
 	_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
-	defer kubeClient.RbacV1().ClusterRoleBindings().Delete("custom-metrics-reader", &metav1.DeleteOptions{})
+	if err != nil {
+		framework.Failf("Failed to create ClusterRoleBindings: %v", err)
+	}
+	defer kubeClient.RbacV1().ClusterRoleBindings().Delete(HPAPermissions.Name, &metav1.DeleteOptions{})
 
 	// Run application that exports the metric
 	_, err = createSDExporterPods(f, kubeClient)
@@ -153,7 +162,10 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
 	defer CleanupAdapter(AdapterForOldResourceModel)
 
 	_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
-	defer kubeClient.RbacV1().ClusterRoleBindings().Delete("custom-metrics-reader", &metav1.DeleteOptions{})
+	if err != nil {
+		framework.Failf("Failed to create ClusterRoleBindings: %v", err)
+	}
+	defer kubeClient.RbacV1().ClusterRoleBindings().Delete(HPAPermissions.Name, &metav1.DeleteOptions{})
 
 	// Run application that exports the metric
 	pod, err := createSDExporterPods(f, kubeClient)
@@ -181,7 +193,7 @@ func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsCl
 	if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+UnusedMetricName) {
 		framework.Failf("Metric '%s' expected but not received", UnusedMetricName)
 	}
-	value, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObject(schema.GroupKind{Group: "", Kind: "Pod"}, stackdriverExporterPod1, CustomMetricName)
+	value, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObject(schema.GroupKind{Group: "", Kind: "Pod"}, stackdriverExporterPod1, CustomMetricName, labels.NewSelector())
 	if err != nil {
 		framework.Failf("Failed query: %s", err)
 	}
@@ -192,7 +204,7 @@ func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsCl
 	if err != nil {
 		framework.Failf("Couldn't create a label filter")
 	}
-	values, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObjects(schema.GroupKind{Group: "", Kind: "Pod"}, labels.NewSelector().Add(*filter), CustomMetricName)
+	values, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObjects(schema.GroupKind{Group: "", Kind: "Pod"}, labels.NewSelector().Add(*filter), CustomMetricName, labels.NewSelector())
 	if err != nil {
 		framework.Failf("Failed query: %s", err)
 	}

vendor/k8s.io/kubernetes/test/e2e/instrumentation/monitoring/influxdb.go

@@ -1,323 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package monitoring
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	influxdb "github.com/influxdata/influxdb/client/v2"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/util/wait"
-	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/kubernetes/test/e2e/framework"
-	instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
-
-	. "github.com/onsi/ginkgo"
-)
-
-var _ = instrumentation.SIGDescribe("Monitoring", func() {
-	f := framework.NewDefaultFramework("monitoring")
-
-	BeforeEach(func() {
-		framework.SkipUnlessProviderIs("gce")
-		framework.SkipUnlessClusterMonitoringModeIs("influxdb")
-	})
-
-	It("should verify monitoring pods and all cluster nodes are available on influxdb using heapster [Feature:InfluxdbMonitoring]", func() {
-		testMonitoringUsingHeapsterInfluxdb(f.ClientSet)
-	})
-})
-
-const (
-	influxdbService       = "monitoring-influxdb"
-	influxdbDatabaseName  = "k8s"
-	podlistQuery          = "show tag values from \"cpu/usage\" with key = pod_name"
-	nodelistQuery         = "show tag values from \"cpu/usage\" with key = nodename"
-	sleepBetweenAttempts  = 5 * time.Second
-	testTimeout           = 5 * time.Minute
-	initializationTimeout = 5 * time.Minute
-)
-
-var (
-	rcLabels         = []string{"heapster", "influxGrafana"}
-	expectedServices = map[string]bool{
-		influxdbService:      false,
-		"monitoring-grafana": false,
-	}
-)
-
-// Query sends a command to the server and returns the Response
-func Query(c clientset.Interface, query string) (*influxdb.Response, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), framework.SingleCallTimeout)
-	defer cancel()
-
-	result, err := c.CoreV1().RESTClient().Get().
-		Context(ctx).
-		Namespace("kube-system").
-		Resource("services").
-		Name(influxdbService+":api").
-		SubResource("proxy").
-		Suffix("query").
-		Param("q", query).
-		Param("db", influxdbDatabaseName).
-		Param("epoch", "s").
-		Do().
-		Raw()
-
-	if err != nil {
-		if ctx.Err() != nil {
-			framework.Failf("Failed to query influx db: %v", err)
-		}
-		return nil, err
-	}
-
-	var response influxdb.Response
-	dec := json.NewDecoder(bytes.NewReader(result))
-	dec.UseNumber()
-	err = dec.Decode(&response)
-
-	if err != nil {
-		return nil, err
-	}
-	return &response, nil
-}
-
-func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, error) {
-	expectedPods := []string{}
-	// Iterate over the labels that identify the replication controllers that we
-	// want to check. The rcLabels contains the value values for the k8s-app key
-	// that identify the replication controllers that we want to check. Using a label
-	// rather than an explicit name is preferred because the names will typically have
-	// a version suffix e.g. heapster-monitoring-v1 and this will change after a rolling
-	// update e.g. to heapster-monitoring-v2. By using a label query we can check for the
-	// situation when a heapster-monitoring-v1 and heapster-monitoring-v2 replication controller
-	// is running (which would be an error except during a rolling update).
-	for _, rcLabel := range rcLabels {
-		selector := labels.Set{"k8s-app": rcLabel}.AsSelector()
-		options := metav1.ListOptions{LabelSelector: selector.String()}
-		deploymentList, err := c.ExtensionsV1beta1().Deployments(metav1.NamespaceSystem).List(options)
-		if err != nil {
-			return nil, err
-		}
-		rcList, err := c.CoreV1().ReplicationControllers(metav1.NamespaceSystem).List(options)
-		if err != nil {
-			return nil, err
-		}
-		psList, err := c.AppsV1().StatefulSets(metav1.NamespaceSystem).List(options)
-		if err != nil {
-			return nil, err
-		}
-		if (len(rcList.Items) + len(deploymentList.Items) + len(psList.Items)) != 1 {
-			return nil, fmt.Errorf("expected to find one replica for RC or deployment with label %s but got %d",
-				rcLabel, len(rcList.Items))
-		}
-		// Check all the replication controllers.
-		for _, rc := range rcList.Items {
-			selector := labels.Set(rc.Spec.Selector).AsSelector()
-			options := metav1.ListOptions{LabelSelector: selector.String()}
-			podList, err := c.CoreV1().Pods(metav1.NamespaceSystem).List(options)
-			if err != nil {
-				return nil, err
-			}
-			for _, pod := range podList.Items {
-				if pod.DeletionTimestamp != nil {
-					continue
-				}
-				expectedPods = append(expectedPods, pod.Name)
-			}
-		}
-		// Do the same for all deployments.
-		for _, rc := range deploymentList.Items {
-			selector := labels.Set(rc.Spec.Selector.MatchLabels).AsSelector()
-			options := metav1.ListOptions{LabelSelector: selector.String()}
-			podList, err := c.CoreV1().Pods(metav1.NamespaceSystem).List(options)
-			if err != nil {
-				return nil, err
-			}
-			for _, pod := range podList.Items {
-				if pod.DeletionTimestamp != nil {
-					continue
-				}
-				expectedPods = append(expectedPods, pod.Name)
-			}
-		}
-		// And for pet sets.
-		for _, ps := range psList.Items {
-			selector := labels.Set(ps.Spec.Selector.MatchLabels).AsSelector()
-			options := metav1.ListOptions{LabelSelector: selector.String()}
-			podList, err := c.CoreV1().Pods(metav1.NamespaceSystem).List(options)
-			if err != nil {
-				return nil, err
-			}
-			for _, pod := range podList.Items {
-				if pod.DeletionTimestamp != nil {
-					continue
-				}
-				expectedPods = append(expectedPods, pod.Name)
-			}
-		}
-	}
-	return expectedPods, nil
-}
-
-func expectedServicesExist(c clientset.Interface) error {
-	serviceList, err := c.CoreV1().Services(metav1.NamespaceSystem).List(metav1.ListOptions{})
-	if err != nil {
-		return err
-	}
-	for _, service := range serviceList.Items {
-		if _, ok := expectedServices[service.Name]; ok {
-			expectedServices[service.Name] = true
-		}
-	}
-	for service, found := range expectedServices {
-		if !found {
-			return fmt.Errorf("Service %q not found", service)
-		}
-	}
-	return nil
-}
-
-func getAllNodesInCluster(c clientset.Interface) ([]string, error) {
-	// It should be OK to list unschedulable Nodes here.
-	nodeList, err := c.CoreV1().Nodes().List(metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-	result := []string{}
-	for _, node := range nodeList.Items {
-		result = append(result, node.Name)
-	}
-	return result, nil
-}
-
-func getInfluxdbData(c clientset.Interface, query string, tag string) (map[string]bool, error) {
-	response, err := Query(c, query)
-	if err != nil {
-		return nil, err
-	}
-	if len(response.Results) != 1 {
-		return nil, fmt.Errorf("expected only one result from Influxdb for query %q. Got %+v", query, response)
-	}
-	if len(response.Results[0].Series) != 1 {
-		return nil, fmt.Errorf("expected exactly one series for query %q.", query)
-	}
-	if len(response.Results[0].Series[0].Columns) != 2 {
-		framework.Failf("Expected two columns for query %q. Found %v", query, response.Results[0].Series[0].Columns)
-	}
-	result := map[string]bool{}
-	for _, value := range response.Results[0].Series[0].Values {
-		name := value[1].(string)
-		result[name] = true
-	}
-	return result, nil
-}
-
-func expectedItemsExist(expectedItems []string, actualItems map[string]bool) bool {
-	if len(actualItems) < len(expectedItems) {
-		return false
-	}
-	for _, item := range expectedItems {
-		if _, found := actualItems[item]; !found {
-			return false
-		}
-	}
-	return true
-}
-
-func validatePodsAndNodes(c clientset.Interface, expectedPods, expectedNodes []string) bool {
-	pods, err := getInfluxdbData(c, podlistQuery, "pod_id")
-	if err != nil {
-		// We don't fail the test here because the influxdb service might still not be running.
-		framework.Logf("failed to query list of pods from influxdb. Query: %q, Err: %v", podlistQuery, err)
-		return false
-	}
-	nodes, err := getInfluxdbData(c, nodelistQuery, "hostname")
-	if err != nil {
-		framework.Logf("failed to query list of nodes from influxdb. Query: %q, Err: %v", nodelistQuery, err)
-		return false
-	}
-	if !expectedItemsExist(expectedPods, pods) {
-		framework.Logf("failed to find all expected Pods.\nExpected: %v\nActual: %v", expectedPods, pods)
-		return false
-	}
-	if !expectedItemsExist(expectedNodes, nodes) {
-		framework.Logf("failed to find all expected Nodes.\nExpected: %v\nActual: %v", expectedNodes, nodes)
-		return false
-	}
-	return true
-}
-
-func testMonitoringUsingHeapsterInfluxdb(c clientset.Interface) {
-	// Check if heapster pods and services are up.
-	var expectedPods []string
-	rcErr := fmt.Errorf("failed to verify expected RCs within timeout")
-	serviceErr := fmt.Errorf("failed to verify expected services within timeout")
-	err := wait.PollImmediate(sleepBetweenAttempts, initializationTimeout, func() (bool, error) {
-		expectedPods, rcErr = verifyExpectedRcsExistAndGetExpectedPods(c)
-		if rcErr != nil {
-			framework.Logf("Waiting for expected RCs (got error: %v)", rcErr)
-			return false, nil
-		}
-		serviceErr = expectedServicesExist(c)
-		if serviceErr != nil {
-			framework.Logf("Waiting for expected services (got error: %v)", serviceErr)
-			return false, nil
-		}
-		return true, nil
-	})
-	if err != nil {
-		framework.ExpectNoError(rcErr)
-		framework.ExpectNoError(serviceErr)
-		framework.Failf("Failed to verify RCs and services within timeout: %v", err)
-	}
-
-	expectedNodes, err := getAllNodesInCluster(c)
-	framework.ExpectNoError(err)
-	startTime := time.Now()
-	for {
-		if validatePodsAndNodes(c, expectedPods, expectedNodes) {
-			return
-		}
-		if time.Since(startTime) >= testTimeout {
-			// temporary workaround to help debug issue #12765
-			printDebugInfo(c)
-			break
-		}
-		time.Sleep(sleepBetweenAttempts)
-	}
-	framework.Failf("monitoring using heapster and influxdb test failed")
-}
-
-func printDebugInfo(c clientset.Interface) {
-	set := labels.Set{"k8s-app": "heapster"}
-	options := metav1.ListOptions{LabelSelector: set.AsSelector().String()}
-	podList, err := c.CoreV1().Pods(metav1.NamespaceSystem).List(options)
-	if err != nil {
-		framework.Logf("Error while listing pods %v", err)
-		return
-	}
-	for _, pod := range podList.Items {
-		framework.Logf("Kubectl output:\n%v",
-			framework.RunKubectlOrDie("log", pod.Name, "--namespace=kube-system", "--container=heapster"))
-	}
-}

vendor/k8s.io/kubernetes/test/e2e/instrumentation/monitoring/prometheus.go

@@ -238,7 +238,7 @@ func fetchPrometheusTargetDiscovery(c clientset.Interface) (TargetDiscovery, err
 		Raw()
 	var qres promTargetsResponse
 	if err != nil {
-		fmt.Printf(string(response))
+		framework.Logf(string(response))
 		return qres.Data, err
 	}
 	err = json.Unmarshal(response, &qres)
@@ -297,7 +297,7 @@ func queryPrometheus(c clientset.Interface, query string, start, end time.Time,
 		Do().
 		Raw()
 	if err != nil {
-		fmt.Printf(string(response))
+		framework.Logf(string(response))
 		return nil, err
 	}
 	var qres promQueryResponse