github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use log functions of core framework

Browse Source
This commit is contained in:
hwdef
2019-08-27 13:52:14 +08:00
parent 12e6930d8a
commit 11e0873d24
9 changed files with 64 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go
View File

@@ -36,7 +36,6 @@ import (
cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
"k8s.io/client-go/restmapper"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
customclient "k8s.io/metrics/pkg/client/custom_metrics"
externalclient "k8s.io/metrics/pkg/client/external_metrics"
)
@@ -58,7 +57,7 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
kubeClient := f.ClientSet
config, err := framework.LoadConfig()
if err != nil {
e2elog.Failf("Failed to load config: %s", err)
framework.Failf("Failed to load config: %s", err)
}
discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config)
cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoveryClient)
@@ -73,7 +72,7 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
kubeClient := f.ClientSet
config, err := framework.LoadConfig()
if err != nil {
e2elog.Failf("Failed to load config: %s", err)
framework.Failf("Failed to load config: %s", err)
}
discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config)
cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoveryClient)
@@ -88,7 +87,7 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
kubeClient := f.ClientSet
config, err := framework.LoadConfig()
if err != nil {
e2elog.Failf("Failed to load config: %s", err)
framework.Failf("Failed to load config: %s", err)
}
externalMetricsClient := externalclient.NewForConfigOrDie(config)
testExternalMetrics(f, kubeClient, externalMetricsClient)
@@ -103,32 +102,32 @@ func testCustomMetrics(f *framework.Framework, kubeClient clientset.Interface, c
gcmService, err := gcm.New(client)
if err != nil {
e2elog.Failf("Failed to create gcm service, %v", err)
framework.Failf("Failed to create gcm service, %v", err)
}
// Set up a cluster: create a custom metric and set up k8s-sd adapter
err = CreateDescriptors(gcmService, projectID)
if err != nil {
e2elog.Failf("Failed to create metric descriptor: %s", err)
framework.Failf("Failed to create metric descriptor: %s", err)
}
defer CleanupDescriptors(gcmService, projectID)
err = CreateAdapter(adapterDeployment)
if err != nil {
e2elog.Failf("Failed to set up: %s", err)
framework.Failf("Failed to set up: %s", err)
}
defer CleanupAdapter(adapterDeployment)
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
if err != nil {
e2elog.Failf("Failed to create ClusterRoleBindings: %v", err)
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)
if err != nil {
e2elog.Failf("Failed to create stackdriver-exporter pod: %s", err)
framework.Failf("Failed to create stackdriver-exporter pod: %s", err)
}
defer cleanupSDExporterPod(f, kubeClient)
@@ -149,33 +148,33 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
gcmService, err := gcm.New(client)
if err != nil {
e2elog.Failf("Failed to create gcm service, %v", err)
framework.Failf("Failed to create gcm service, %v", err)
}
// Set up a cluster: create a custom metric and set up k8s-sd adapter
err = CreateDescriptors(gcmService, projectID)
if err != nil {
e2elog.Failf("Failed to create metric descriptor: %s", err)
framework.Failf("Failed to create metric descriptor: %s", err)
}
defer CleanupDescriptors(gcmService, projectID)
// Both deployments - for old and new resource model - expose External Metrics API.
err = CreateAdapter(AdapterForOldResourceModel)
if err != nil {
e2elog.Failf("Failed to set up: %s", err)
framework.Failf("Failed to set up: %s", err)
}
defer CleanupAdapter(AdapterForOldResourceModel)
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
if err != nil {
e2elog.Failf("Failed to create ClusterRoleBindings: %v", err)
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)
if err != nil {
e2elog.Failf("Failed to create stackdriver-exporter pod: %s", err)
framework.Failf("Failed to create stackdriver-exporter pod: %s", err)
}
defer cleanupSDExporterPod(f, kubeClient)
@@ -190,34 +189,34 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsClient customclient.CustomMetricsClient, discoveryClient *discovery.DiscoveryClient) {
resources, err := discoveryClient.ServerResourcesForGroupVersion("custom.metrics.k8s.io/v1beta1")
if err != nil {
e2elog.Failf("Failed to retrieve a list of supported metrics: %s", err)
framework.Failf("Failed to retrieve a list of supported metrics: %s", err)
}
if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+CustomMetricName) {
e2elog.Failf("Metric '%s' expected but not received", CustomMetricName)
framework.Failf("Metric '%s' expected but not received", CustomMetricName)
}
if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+UnusedMetricName) {
e2elog.Failf("Metric '%s' expected but not received", 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, labels.NewSelector())
if err != nil {
e2elog.Failf("Failed query: %s", err)
framework.Failf("Failed query: %s", err)
}
if value.Value.Value() != CustomMetricValue {
e2elog.Failf("Unexpected metric value for metric %s: expected %v but received %v", CustomMetricName, CustomMetricValue, value.Value)
framework.Failf("Unexpected metric value for metric %s: expected %v but received %v", CustomMetricName, CustomMetricValue, value.Value)
}
filter, err := labels.NewRequirement("name", selection.Equals, []string{stackdriverExporterLabel})
if err != nil {
e2elog.Failf("Couldn't create a label filter")
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, labels.NewSelector())
if err != nil {
e2elog.Failf("Failed query: %s", err)
framework.Failf("Failed query: %s", err)
}
if len(values.Items) != 1 {
e2elog.Failf("Expected results for exactly 1 pod, but %v results received", len(values.Items))
framework.Failf("Expected results for exactly 1 pod, but %v results received", len(values.Items))
}
if values.Items[0].DescribedObject.Name != stackdriverExporterPod1 || values.Items[0].Value.Value() != CustomMetricValue {
e2elog.Failf("Unexpected metric value for metric %s and pod %s: %v", CustomMetricName, values.Items[0].DescribedObject.Name, values.Items[0].Value.Value())
framework.Failf("Unexpected metric value for metric %s and pod %s: %v", CustomMetricName, values.Items[0].DescribedObject.Name, values.Items[0].Value.Value())
}
}
@@ -242,27 +241,27 @@ func verifyResponseFromExternalMetricsAPI(f *framework.Framework, externalMetric
NamespacedMetrics("dummy").
List("custom.googleapis.com|"+CustomMetricName, labels.NewSelector().Add(*req1, *req2, *req3, *req4, *req5))
if err != nil {
e2elog.Failf("Failed query: %s", err)
framework.Failf("Failed query: %s", err)
}
if len(values.Items) != 1 {
e2elog.Failf("Expected exactly one external metric value, but % values received", len(values.Items))
framework.Failf("Expected exactly one external metric value, but % values received", len(values.Items))
}
if values.Items[0].MetricName != "custom.googleapis.com|"+CustomMetricName ||
values.Items[0].Value.Value() != CustomMetricValue ||
// Check one label just to make sure labels are included
values.Items[0].MetricLabels["resource.labels.pod_id"] != string(pod.UID) {
e2elog.Failf("Unexpected result for metric %s: %v", CustomMetricName, values.Items[0])
framework.Failf("Unexpected result for metric %s: %v", CustomMetricName, values.Items[0])
}
}
func cleanupSDExporterPod(f *framework.Framework, cs clientset.Interface) {
err := cs.CoreV1().Pods(f.Namespace.Name).Delete(stackdriverExporterPod1, &metav1.DeleteOptions{})
if err != nil {
e2elog.Logf("Failed to delete %s pod: %v", stackdriverExporterPod1, err)
framework.Logf("Failed to delete %s pod: %v", stackdriverExporterPod1, err)
}
err = cs.CoreV1().Pods(f.Namespace.Name).Delete(stackdriverExporterPod2, &metav1.DeleteOptions{})
if err != nil {
e2elog.Logf("Failed to delete %s pod: %v", stackdriverExporterPod2, err)
framework.Logf("Failed to delete %s pod: %v", stackdriverExporterPod2, err)
}
}