github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Revert "e2e: wait for pods with gomega"

Browse Source
This commit is contained in:
Antonio Ojea
2023-02-06 12:08:22 +01:00
committed by GitHub
parent 561a35f358
commit 7f5ae1c0c1
126 changed files with 1158 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/instrumentation/monitoring/metrics_grabber.go
View File

@@ -46,7 +46,7 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
gomega.Eventually(ctx, func() error {
grabber, err = e2emetrics.NewMetricsGrabber(ctx, c, ec, f.ClientConfig(), true, true, true, true, true, true)
if err != nil {
return fmt.Errorf("failed to create metrics grabber: %w", err)
return fmt.Errorf("failed to create metrics grabber: %v", err)
}
return nil
}, 5*time.Minute, 10*time.Second).Should(gomega.BeNil())

4
test/e2e/instrumentation/monitoring/stackdriver_metadata_agent.go
View File

@@ -120,7 +120,7 @@ func verifyPodExists(response []byte, containerName string) (bool, error) {
var metadata Metadata
err := json.Unmarshal(response, &metadata)
if err != nil {
return false, fmt.Errorf("Failed to unmarshall: %w", err)
return false, fmt.Errorf("Failed to unmarshall: %s", err)
}
for _, result := range metadata.Results {
@@ -130,7 +130,7 @@ func verifyPodExists(response []byte, containerName string) (bool, error) {
}
resource, err := parseResource(rawResource)
if err != nil {
return false, fmt.Errorf("No 'resource' label: %w", err)
return false, fmt.Errorf("No 'resource' label: %s", err)
}
if resource.resourceType == "k8s_container" &&
resource.resourceLabels["container_name"] == containerName {