diff --git a/Makefile b/Makefile index eac9c280..a870f538 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ TAG_PREFIX=v TAG?=$(TAG_PREFIX)$(VERSION) GO_VERSION?=1.22.2 -GOLANGCI_VERSION?=1.53.2 +GOLANGCI_VERSION?=1.56.2 .PHONY: all all: prometheus-adapter diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 4c9bd0d5..9b6be8ba 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -106,12 +106,12 @@ func waitForPrometheusReady(ctx context.Context, namespace string, name string) return false, err } - var reconciled, available *monitoringv1.PrometheusCondition + var reconciled, available *monitoringv1.Condition for _, condition := range prom.Status.Conditions { cond := condition - if cond.Type == monitoringv1.PrometheusReconciled { + if cond.Type == monitoringv1.Reconciled { reconciled = &cond - } else if cond.Type == monitoringv1.PrometheusAvailable { + } else if cond.Type == monitoringv1.Available { available = &cond } } @@ -120,7 +120,7 @@ func waitForPrometheusReady(ctx context.Context, namespace string, name string) log.Printf("Prometheus instance '%s': Waiting for reconciliation status...", name) return false, nil } - if reconciled.Status != monitoringv1.PrometheusConditionTrue { + if reconciled.Status != monitoringv1.ConditionTrue { log.Printf("Prometheus instance '%s': Reconciiled = %v. Waiting for reconciliation (reason %s, %q)...", name, reconciled.Status, reconciled.Reason, reconciled.Message) return false, nil } @@ -136,7 +136,7 @@ func waitForPrometheusReady(ctx context.Context, namespace string, name string) log.Printf("Prometheus instance '%s': Waiting for Available status...", name) return false, nil } - if available.Status != monitoringv1.PrometheusConditionTrue { + if available.Status != monitoringv1.ConditionTrue { log.Printf("Prometheus instance '%s': Available = %v. Waiting for Available status... (reason %s, %q)", name, available.Status, available.Reason, available.Message) return false, nil }