Skip to content

Commit

Permalink
*: update-lint
Browse files Browse the repository at this point in the history
Signed-off-by: Damien Grisonnet <[email protected]>
  • Loading branch information
dgrisonnet committed May 16, 2024
1 parent d3784c5 commit 1d31a46
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down

0 comments on commit 1d31a46

Please sign in to comment.