Skip to content

K
k3s
Unverified Commit 1e689a8b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63978 from kawych/master

Automatic merge from submit-queue (batch tested with PRs 63969, 63902, 63689, 63973, 63978). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Allow for system metrics discovery in Custom Metrics - Stackdriver Adapter test **What this PR does / why we need it**: Allow for system metrics discovery in Custom Metrics - Stackdriver Adapter test **Release note**: ```release-note NONE ```
parents b056924c 63e6496c
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go
View file @ 1e689a8b
...@@ -175,20 +175,10 @@ func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsCl ...@@ -175,20 +175,10 @@ func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsCl
if err != nil { if err != nil {
framework.Failf("Failed to retrieve a list of supported metrics: %s", err) framework.Failf("Failed to retrieve a list of supported metrics: %s", err)
} }
gotCustomMetric, gotUnusedMetric := false, false if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+CustomMetricName) {
for _, resource := range resources.APIResources {
if resource.Name == "*/"+CustomMetricName {
gotCustomMetric = true
} else if resource.Name == "*/"+UnusedMetricName {
gotUnusedMetric = true
} else {
framework.Failf("Unexpected metric %s. Only metric %s should be supported", resource.Name, CustomMetricName)
}
}
if !gotCustomMetric {
framework.Failf("Metric '%s' expected but not received", CustomMetricName) framework.Failf("Metric '%s' expected but not received", CustomMetricName)
} }
if !gotUnusedMetric { if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+UnusedMetricName) {
framework.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) value, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObject(schema.GroupKind{Group: "", Kind: "Pod"}, stackdriverExporterPod1, CustomMetricName)
...@@ -214,6 +204,15 @@ func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsCl ...@@ -214,6 +204,15 @@ func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsCl
} }
} }
func containsResource(resourcesList []metav1.APIResource, resourceName string) bool {
for _, resource := range resourcesList {
if resource.Name == resourceName {
return true
}
}
return false
}
func verifyResponseFromExternalMetricsAPI(f *framework.Framework, externalMetricsClient externalclient.ExternalMetricsClient, pod *v1.Pod) { func verifyResponseFromExternalMetricsAPI(f *framework.Framework, externalMetricsClient externalclient.ExternalMetricsClient, pod *v1.Pod) {
req1, _ := labels.NewRequirement("resource.type", selection.Equals, []string{"gke_container"}) req1, _ := labels.NewRequirement("resource.type", selection.Equals, []string{"gke_container"})
// It's important to filter out only metrics from the right namespace, since multiple e2e tests // It's important to filter out only metrics from the right namespace, since multiple e2e tests
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment