coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 06:45:27 +01:00
Code Issues Releases Wiki Activity

Enable depguard in e2e tests

Browse Source 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
This commit is contained in:
Arthur Silva Sens
2023-10-10 14:20:06 -03:00
parent 2abc7f14a5
commit da57db9366
5 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@@ -48,6 +48,7 @@ linters-settings:
- "**/thanos/*.go"
- "**/versionutil/*.go"
- "**/webconfig/*.go"
- "**/e2e/*.go"
deny:
- pkg: "github.com/pkg/errors"
dsc: Should be replaced with standard lib errors or fmt.Errorf

28
test/e2e/alertmanager_test.go
View File

@@ -18,6 +18,7 @@ import (
"bytes"
"context"
"crypto/tls"
"errors"
"fmt"
"net/http"
"reflect"
@@ -27,7 +28,6 @@ import (
"time"
"github.com/google/go-cmp/cmp"
"github.com/pkg/errors"
"github.com/stretchr/testify/require"
"golang.org/x/net/http2"
appsv1 "k8s.io/api/apps/v1"
@@ -442,7 +442,7 @@ func testAMClusterGossipSilences(t *testing.T) {
}
if *silences[0].ID != silID {
return false, errors.Errorf("expected silence id on alertmanager %v to match id of created silence '%v' but got %v", i, silID, *silences[0].ID)
return false, fmt.Errorf("expected silence id on alertmanager %v to match id of created silence '%v' but got %v", i, silID, *silences[0].ID)
}
return true, nil
})
@@ -570,7 +570,7 @@ An Alert test
firstExpectedString := "firstConfigWebHook"
if err := framework.WaitForAlertmanagerConfigToContainString(context.Background(), ns, alertmanager.Name, firstExpectedString); err != nil {
t.Fatal(errors.Wrap(err, "failed to wait for first expected config"))
t.Fatal(fmt.Errorf("failed to wait for first expected config: %w", err))
}
cfg.Data["alertmanager.yaml"] = []byte(secondConfig)
@@ -581,7 +581,7 @@ An Alert test
secondExpectedString := "secondConfigWebHook"
if err := framework.WaitForAlertmanagerConfigToContainString(context.Background(), ns, alertmanager.Name, secondExpectedString); err != nil {
t.Fatal(errors.Wrap(err, "failed to wait for second expected config"))
t.Fatal(fmt.Errorf("failed to wait for second expected config: %w", err))
}
priorToReloadTime := time.Now()
@@ -591,7 +591,7 @@ An Alert test
}
if err := framework.WaitForAlertmanagerConfigToBeReloaded(context.Background(), ns, alertmanager.Name, priorToReloadTime); err != nil {
t.Fatal(errors.Wrap(err, "failed to wait for additional configMaps reload"))
t.Fatal(fmt.Errorf("failed to wait for additional configMaps reload: %w", err))
}
priorToReloadTime = time.Now()
@@ -601,7 +601,7 @@ An Alert test
}
if err := framework.WaitForAlertmanagerConfigToBeReloaded(context.Background(), ns, alertmanager.Name, priorToReloadTime); err != nil {
t.Fatal(errors.Wrap(err, "failed to wait for additional secrets reload"))
t.Fatal(fmt.Errorf("failed to wait for additional secrets reload: %w", err))
}
}
@@ -684,7 +684,7 @@ An Alert test
}
if err := framework.WaitForAlertmanagerConfigToBeReloaded(context.Background(), ns, alertmanager.Name, priorToReloadTime); err != nil {
t.Fatal(errors.Wrap(err, "failed to wait for additional secrets reload"))
t.Fatal(fmt.Errorf("failed to wait for additional secrets reload: %w", err))
}
}
@@ -824,7 +824,7 @@ inhibit_rules:
close(done)
select {
case err := <-errc:
t.Fatal(errors.Wrapf(err, "sending alert to alertmanager %v", replica))
t.Fatal(fmt.Errorf("sending alert to alertmanager %v: %w", replica, err))
default:
return
}
@@ -1502,7 +1502,7 @@ func testAlertmanagerConfigCRD(t *testing.T) {
err = wait.PollUntilContextTimeout(context.Background(), 5*time.Second, 2*time.Minute, false, func(ctx context.Context) (bool, error) {
cfgSecret, err := framework.KubeClient.CoreV1().Secrets(ns).Get(ctx, amConfigSecretName, metav1.GetOptions{})
if err != nil {
lastErr = errors.Wrap(err, "failed to get generated configuration secret")
lastErr = fmt.Errorf("failed to get generated configuration secret: %w", err)
return false, nil
}
@@ -1640,7 +1640,7 @@ templates: []
t.Fatal(err)
}
if diff := cmp.Diff(uncompressed, expected); diff != "" {
lastErr = errors.Errorf("got(-), want(+):\n%s", diff)
lastErr = fmt.Errorf("got(-), want(+):\n%s", diff)
return false, nil
}
@@ -1661,7 +1661,7 @@ templates: []
err = wait.PollUntilContextTimeout(context.Background(), 5*time.Second, 2*time.Minute, false, func(ctx context.Context) (bool, error) {
cfgSecret, err := framework.KubeClient.CoreV1().Secrets(ns).Get(ctx, amConfigSecretName, metav1.GetOptions{})
if err != nil {
lastErr = errors.Wrap(err, "failed to get generated configuration secret")
lastErr = fmt.Errorf("failed to get generated configuration secret: %w", err)
return false, nil
}
@@ -1692,7 +1692,7 @@ templates: []
t.Fatal(err)
}
if diff := cmp.Diff(uncompressed, expected); diff != "" {
lastErr = errors.Errorf("got(-), want(+):\n%s", diff)
lastErr = fmt.Errorf("got(-), want(+):\n%s", diff)
return false, nil
}
@@ -1769,7 +1769,7 @@ inhibit_rules:
t.Fatal(err)
}
if diff := cmp.Diff(uncompressed, yamlConfig); diff != "" {
lastErr = errors.Errorf("got(-), want(+):\n%s", diff)
lastErr = fmt.Errorf("got(-), want(+):\n%s", diff)
return false, nil
}
@@ -1996,7 +1996,7 @@ templates:
}
if diff := cmp.Diff(uncompressed, yamlConfig); diff != "" {
lastErr = errors.Errorf("got(-), want(+):\n%s", diff)
lastErr = fmt.Errorf("got(-), want(+):\n%s", diff)
return false, nil
}

6
test/e2e/denylist_test.go
View File

@@ -16,10 +16,10 @@ package e2e
import (
"context"
"fmt"
"testing"
"github.com/gogo/protobuf/proto"
"github.com/pkg/errors"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
api_errors "k8s.io/apimachinery/pkg/api/errors"
@@ -133,7 +133,7 @@ func testDenyServiceMonitor(t *testing.T) {
svc := framework.MakePrometheusService("denied", "denied", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), denied, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -155,7 +155,7 @@ func testDenyServiceMonitor(t *testing.T) {
svc := framework.MakePrometheusService("allowed", "allowed", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), allowed, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}

14
test/e2e/prometheus_instance_namespaces_test.go
View File

@@ -16,9 +16,9 @@ package e2e
import (
"context"
"fmt"
"testing"
"github.com/pkg/errors"
v1 "k8s.io/api/core/v1"
api_errors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -138,7 +138,7 @@ func testPrometheusInstanceNamespacesDenyList(t *testing.T) {
svc := framework.MakeEchoService("denied", "monitored", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), deniedNs, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -183,7 +183,7 @@ func testPrometheusInstanceNamespacesDenyList(t *testing.T) {
svc := framework.MakePrometheusService("instance", "monitored", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), instanceNs, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -286,7 +286,7 @@ func testPrometheusInstanceNamespacesAllowList(t *testing.T) {
svc := framework.MakePrometheusService("instance", "monitored", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), instanceNs, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -310,7 +310,7 @@ func testPrometheusInstanceNamespacesAllowList(t *testing.T) {
svc := framework.MakeEchoService("allowed", "monitored", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), allowedNs, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -436,7 +436,7 @@ func testPrometheusInstanceNamespacesNamespaceNotFound(t *testing.T) {
svc := framework.MakePrometheusService("instance", "monitored", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), instanceNs, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -455,7 +455,7 @@ func testPrometheusInstanceNamespacesNamespaceNotFound(t *testing.T) {
svc := framework.MakeEchoService("allowed", "monitored", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), allowedNs, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}

79
test/e2e/prometheus_test.go
View File

@@ -32,7 +32,6 @@ import (
"time"
"github.com/kylelemons/godebug/pretty"
"github.com/pkg/errors"
"github.com/stretchr/testify/require"
"golang.org/x/net/http2"
"google.golang.org/protobuf/proto"
@@ -301,7 +300,7 @@ func createK8sAppMonitoring(name, ns string, prwtc testFramework.PromRemoteWrite
}
if _, err = framework.MonClientV1.ServiceMonitors(ns).Create(context.Background(), sm, metav1.CreateOptions{}); err != nil {
return nil, prometheusRecieverSvc, errors.Wrap(err, "creating ServiceMonitor failed")
return nil, prometheusRecieverSvc, fmt.Errorf("creating ServiceMonitor failed: %w", err)
}
// Create prometheus receiver for remote writes
@@ -1035,10 +1034,10 @@ func testPromStorageLabelsAnnotations(t *testing.T) {
for _, vct := range sts.Items[0].Spec.VolumeClaimTemplates {
if vct.Name == "prometheus-"+name+"-db" {
if val := vct.Labels["test-label"]; val != "foo" {
return false, errors.Errorf("incorrect volume claim label on sts, want: %v, got: %v", "foo", val)
return false, fmt.Errorf("incorrect volume claim label on sts, want: %v, got: %v", "foo", val)
}
if val := vct.Annotations["test-annotation"]; val != "bar" {
return false, errors.Errorf("incorrect volume claim annotation on sts, want: %v, got: %v", "bar", val)
return false, fmt.Errorf("incorrect volume claim annotation on sts, want: %v, got: %v", "bar", val)
}
return true, nil
}
@@ -1240,7 +1239,7 @@ scrape_configs:
cfg, err := framework.KubeClient.CoreV1().Secrets(ns).Get(context.Background(), cfg.Name, metav1.GetOptions{})
if err != nil {
t.Fatal(errors.Wrap(err, "could not retrieve previous secret"))
t.Fatal(fmt.Errorf("could not retrieve previous secret: %w", err))
}
cfg.Data["prometheus.yaml.gz"] = secondConfigCompressed
@@ -1299,7 +1298,7 @@ func testPromAdditionalScrapeConfig(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1357,7 +1356,7 @@ func testPromAdditionalAlertManagerConfig(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1386,7 +1385,7 @@ func testPromAdditionalAlertManagerConfig(t *testing.T) {
})
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus Alertmanager configuration failed"))
t.Fatal(fmt.Errorf("validating Prometheus Alertmanager configuration failed: %w", err))
}
}
@@ -1415,7 +1414,7 @@ func testPromReloadRules(t *testing.T) {
pSVC := framework.MakePrometheusService(p.Name, "not-relevant", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1473,7 +1472,7 @@ func testPromMultiplePrometheusRulesSameNS(t *testing.T) {
pSVC := framework.MakePrometheusService(p.Name, "not-relevant", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1529,7 +1528,7 @@ func testPromMultiplePrometheusRulesDifferentNS(t *testing.T) {
pSVC := framework.MakePrometheusService(p.Name, "not-relevant", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), rootNS, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1600,7 +1599,7 @@ func testPromRulesExceedingConfigMapLimit(t *testing.T) {
pSVC := framework.MakePrometheusService(p.Name, "not-relevant", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1879,7 +1878,7 @@ func testPromOnlyUpdatedOnRelevantChanges(t *testing.T) {
pSVC := framework.MakePrometheusService(prometheus.Name, name, v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -1896,7 +1895,7 @@ func testPromOnlyUpdatedOnRelevantChanges(t *testing.T) {
err = framework.WaitForDiscoveryWorking(context.Background(), ns, pSVC.Name, prometheus.Name)
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus target discovery failed"))
t.Fatal(fmt.Errorf("validating Prometheus target discovery failed: %w", err))
}
if err := framework.DeletePrometheusAndWaitUntilGone(context.Background(), ns, name); err != nil {
@@ -2170,7 +2169,7 @@ func testPromDiscovery(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2182,7 +2181,7 @@ func testPromDiscovery(t *testing.T) {
err = framework.WaitForDiscoveryWorking(context.Background(), ns, svc.Name, prometheusName)
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus target discovery failed"))
t.Fatal(fmt.Errorf("validating Prometheus target discovery failed: %w", err))
}
}
@@ -2263,7 +2262,7 @@ func testShardingProvisioning(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2334,7 +2333,7 @@ func testResharding(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2419,7 +2418,7 @@ func testPromAlertmanagerDiscovery(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2439,12 +2438,12 @@ func testPromAlertmanagerDiscovery(t *testing.T) {
}
if _, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, amsvc); err != nil {
t.Fatal(errors.Wrap(err, "creating Alertmanager service failed"))
t.Fatal(fmt.Errorf("creating Alertmanager service failed: %w", err))
}
err = wait.PollUntilContextTimeout(context.Background(), time.Second, 18*time.Minute, false, isAlertmanagerDiscoveryWorking(ns, svc.Name, alertmanagerName))
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus Alertmanager discovery failed"))
t.Fatal(fmt.Errorf("validating Prometheus Alertmanager discovery failed: %w", err))
}
}
@@ -2517,7 +2516,7 @@ func testPromDiscoverTargetPort(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2529,7 +2528,7 @@ func testPromDiscoverTargetPort(t *testing.T) {
err = framework.WaitForDiscoveryWorking(context.Background(), ns, svc.Name, prometheusName)
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus target discovery failed"))
t.Fatal(fmt.Errorf("validating Prometheus target discovery failed: %w", err))
}
}
@@ -2573,7 +2572,7 @@ func testPromOpMatchPromAndServMonInDiffNSs(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), prometheusNSName, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2888,7 +2887,7 @@ func testOperatorNSScope(t *testing.T) {
pSVC := framework.MakePrometheusService(p.Name, "not-relevant", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), mainNS, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -2959,7 +2958,7 @@ func testOperatorNSScope(t *testing.T) {
pSVC := framework.MakePrometheusService(p.Name, "not-relevant", v1.ServiceTypeClusterIP)
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), prometheusNS, pSVC); err != nil {
t.Fatal(errors.Wrap(err, "creating Prometheus service failed"))
t.Fatal(fmt.Errorf("creating Prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -3478,7 +3477,7 @@ func testPromStaticProbe(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
testCtx.AddFinalizerFn(finalizerFn)
}
@@ -4158,7 +4157,7 @@ func testPromEnforcedNamespaceLabel(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
ctx.AddFinalizerFn(finalizerFn)
}
@@ -4170,7 +4169,7 @@ func testPromEnforcedNamespaceLabel(t *testing.T) {
err = framework.WaitForDiscoveryWorking(context.Background(), ns, svc.Name, prometheusName)
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus target discovery failed"))
t.Fatal(fmt.Errorf("validating Prometheus target discovery failed: %w", err))
}
// Check that the namespace label is enforced to the correct value.
@@ -4183,7 +4182,7 @@ func testPromEnforcedNamespaceLabel(t *testing.T) {
loopErr = nil
res, err := framework.PrometheusQuery(ns, svc.Name, "http", "prometheus_build_info")
if err != nil {
loopErr = errors.Wrap(err, "failed to query Prometheus")
loopErr = fmt.Errorf("failed to query Prometheus: %w", err)
return false, nil
}
@@ -4310,7 +4309,7 @@ func testPromNamespaceEnforcementExclusion(t *testing.T) {
}
if finalizerFn, err := framework.CreateOrUpdateServiceAndWaitUntilReady(context.Background(), ns, svc); err != nil {
t.Fatal(errors.Wrap(err, "creating prometheus service failed"))
t.Fatal(fmt.Errorf("creating prometheus service failed: %w", err))
} else {
ctx.AddFinalizerFn(finalizerFn)
}
@@ -4322,7 +4321,7 @@ func testPromNamespaceEnforcementExclusion(t *testing.T) {
err = framework.WaitForDiscoveryWorking(context.Background(), ns, svc.Name, prometheusName)
if err != nil {
t.Fatal(errors.Wrap(err, "validating Prometheus target discovery failed"))
t.Fatal(fmt.Errorf("validating Prometheus target discovery failed: %w", err))
}
// Check that the namespace label isn't enforced.
@@ -4335,7 +4334,7 @@ func testPromNamespaceEnforcementExclusion(t *testing.T) {
loopErr = nil
res, err := framework.PrometheusQuery(ns, svc.Name, "http", "prometheus_build_info")
if err != nil {
loopErr = errors.Wrap(err, "failed to query Prometheus")
loopErr = fmt.Errorf("failed to query Prometheus: %w", err)
return false, nil
}
@@ -4819,7 +4818,7 @@ func testPromUnavailableConditionStatus(t *testing.T) {
}
if cond.Status != monitoringv1.ConditionFalse {
pollErr = errors.Errorf(
pollErr = fmt.Errorf(
"expected Available condition to be 'False', got %q (reason %s, %q)",
cond.Status,
cond.Reason,
@@ -4829,7 +4828,7 @@ func testPromUnavailableConditionStatus(t *testing.T) {
}
if cond.Reason != "NoPodReady" {
pollErr = errors.Errorf(
pollErr = fmt.Errorf(
"expected Available condition's reason to be 'NoPodReady', got %s (message %q)",
cond.Reason,
cond.Message,
@@ -4840,7 +4839,7 @@ func testPromUnavailableConditionStatus(t *testing.T) {
return true, nil
}
pollErr = errors.Errorf("failed to find Available condition in status subresource")
pollErr = fmt.Errorf("failed to find Available condition in status subresource")
return false, nil
})
@@ -4895,7 +4894,7 @@ func testPromDegradedConditionStatus(t *testing.T) {
}
if cond.Status != monitoringv1.ConditionDegraded {
pollErr = errors.Errorf(
pollErr = fmt.Errorf(
"expected Available condition to be 'Degraded', got %q (reason %s, %q)",
cond.Status,
cond.Reason,
@@ -4905,7 +4904,7 @@ func testPromDegradedConditionStatus(t *testing.T) {
}
if cond.Reason != "SomePodsNotReady" {
pollErr = errors.Errorf(
pollErr = fmt.Errorf(
"expected Available condition's reason to be 'SomePodsNotReady', got %s (message %q)",
cond.Reason,
cond.Message,
@@ -4914,7 +4913,7 @@ func testPromDegradedConditionStatus(t *testing.T) {
}
if !strings.Contains(cond.Message, "bad-image") {
pollErr = errors.Errorf(
pollErr = fmt.Errorf(
"expected Available condition's message to contain 'bad-image', got %q",
cond.Message,
)
@@ -4924,7 +4923,7 @@ func testPromDegradedConditionStatus(t *testing.T) {
return true, nil
}
pollErr = errors.Errorf("failed to find Available condition in status subresource")
pollErr = fmt.Errorf("failed to find Available condition in status subresource")
return false, nil
})