Skip to content

Commit d0b8ed3

Browse files
jgwestjgwest
authored
Upgrade to latest prometheus-operator (#1707)
Signed-off-by: Jonathan West <jonwest@redhat.com>
1 parent 8875fb4 commit d0b8ed3

File tree

8 files changed

+53
-1149
lines changed

8 files changed

+53
-1149
lines changed

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import (
2525
"strings"
2626

2727
"github.com/argoproj/argo-cd/v2/util/env"
28-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
2928
appsv1 "github.com/openshift/api/apps/v1"
3029
configv1 "github.com/openshift/api/config/v1"
3130
oauthv1 "github.com/openshift/api/oauth/v1"
3231
routev1 "github.com/openshift/api/route/v1"
3332
templatev1 "github.com/openshift/api/template/v1"
33+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
3434
"sigs.k8s.io/controller-runtime/pkg/cache"
3535
"sigs.k8s.io/controller-runtime/pkg/manager"
3636
"sigs.k8s.io/controller-runtime/pkg/webhook"

‎controllers/argocd/notifications.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"reflect"
77
"time"
88

9-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
9+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1010
appsv1 "k8s.io/api/apps/v1"
1111
corev1 "k8s.io/api/core/v1"
1212
rbacv1 "k8s.io/api/rbac/v1"

‎controllers/argocd/notifications_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"testing"
77

8-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
98
"github.com/google/go-cmp/cmp"
9+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1010
"github.com/stretchr/testify/assert"
1111
appsv1 "k8s.io/api/apps/v1"
1212

@@ -341,7 +341,7 @@ func TestReconcileNotifications_CreateServiceMonitor(t *testing.T) {
341341

342342
assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Port, "metrics")
343343
assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Scheme, "http")
344-
assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Interval, "30s")
344+
assert.Equal(t, testServiceMonitor.Spec.Endpoints[0].Interval, monitoringv1.Duration("30s"))
345345
assert.Equal(t, testServiceMonitor.Spec.Selector.MatchLabels["app.kubernetes.io/name"],
346346
fmt.Sprintf("%s-%s", a.Name, "notifications-controller-metrics"))
347347
}

‎controllers/argocd/prometheus.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import (
1818
"context"
1919
"fmt"
2020

21-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
21+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
"k8s.io/apimachinery/pkg/util/intstr"
24+
"k8s.io/utils/ptr"
2425
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2526

2627
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
@@ -291,7 +292,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
291292
Type: intstr.String,
292293
StrVal: fmt.Sprintf("kube_statefulset_status_replicas{statefulset=\"%s\", namespace=\"%s\"} != kube_statefulset_status_replicas_ready{statefulset=\"%s\", namespace=\"%s\"} ", cr.Name+"-application-controller", cr.Namespace, cr.Name+"-application-controller", cr.Namespace),
293294
},
294-
For: "1m",
295+
For: ptr.To((monitoringv1.Duration)("1m")),
295296
Labels: map[string]string{
296297
"severity": "critical",
297298
},
@@ -305,7 +306,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
305306
Type: intstr.String,
306307
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", cr.Name+"-server", cr.Namespace, cr.Name+"-server", cr.Namespace),
307308
},
308-
For: "1m",
309+
For: ptr.To((monitoringv1.Duration)("1m")),
309310
Labels: map[string]string{
310311
"severity": "critical",
311312
},
@@ -319,7 +320,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
319320
Type: intstr.String,
320321
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", cr.Name+"-repo-server", cr.Namespace, cr.Name+"-repo-server", cr.Namespace),
321322
},
322-
For: "1m",
323+
For: ptr.To((monitoringv1.Duration)("1m")),
323324
Labels: map[string]string{
324325
"severity": "critical",
325326
},
@@ -333,7 +334,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
333334
Type: intstr.String,
334335
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", cr.Name+"-applicationset-controller", cr.Namespace, cr.Name+"-applicationset-controller", cr.Namespace),
335336
},
336-
For: "5m",
337+
For: ptr.To((monitoringv1.Duration)("5m")),
337338
Labels: map[string]string{
338339
"severity": "warning",
339340
},
@@ -347,7 +348,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
347348
Type: intstr.String,
348349
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", cr.Name+"-dex-server", cr.Namespace, cr.Name+"-dex-server", cr.Namespace),
349350
},
350-
For: "5m",
351+
For: ptr.To((monitoringv1.Duration)("5m")),
351352
Labels: map[string]string{
352353
"severity": "warning",
353354
},
@@ -361,7 +362,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
361362
Type: intstr.String,
362363
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", cr.Name+"-notifications-controller", cr.Namespace, cr.Name+"-notifications-controller", cr.Namespace),
363364
},
364-
For: "5m",
365+
For: ptr.To((monitoringv1.Duration)("5m")),
365366
Labels: map[string]string{
366367
"severity": "warning",
367368
},
@@ -375,7 +376,7 @@ func (r *ReconcileArgoCD) reconcilePrometheusRule(cr *argoproj.ArgoCD) error {
375376
Type: intstr.String,
376377
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", cr.Name+"-redis", cr.Namespace, cr.Name+"-redis", cr.Namespace),
377378
},
378-
For: "5m",
379+
For: ptr.To((monitoringv1.Duration)("5m")),
379380
Labels: map[string]string{
380381
"severity": "warning",
381382
},

‎controllers/argocd/prometheus_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"fmt"
66
"testing"
77

8-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
8+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
99
"github.com/stretchr/testify/assert"
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"k8s.io/apimachinery/pkg/types"
1212
"k8s.io/apimachinery/pkg/util/intstr"
13+
"k8s.io/utils/ptr"
1314
"sigs.k8s.io/controller-runtime/pkg/client"
1415

1516
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
@@ -72,7 +73,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
7273
Type: intstr.String,
7374
StrVal: fmt.Sprintf("kube_statefulset_status_replicas{statefulset=\"%s\", namespace=\"%s\"} != kube_statefulset_status_replicas_ready{statefulset=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-application-controller"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-application-controller"), test.argocd.Namespace),
7475
},
75-
For: "1m",
76+
For: ptr.To((monitoringv1.Duration)("1m")),
7677
Labels: map[string]string{
7778
"severity": "critical",
7879
},
@@ -86,7 +87,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
8687
Type: intstr.String,
8788
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-server"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-server"), test.argocd.Namespace),
8889
},
89-
For: "1m",
90+
For: ptr.To((monitoringv1.Duration)("1m")),
9091
Labels: map[string]string{
9192
"severity": "critical",
9293
},
@@ -100,7 +101,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
100101
Type: intstr.String,
101102
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-repo-server"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-repo-server"), test.argocd.Namespace),
102103
},
103-
For: "1m",
104+
For: ptr.To((monitoringv1.Duration)("1m")),
104105
Labels: map[string]string{
105106
"severity": "critical",
106107
},
@@ -114,7 +115,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
114115
Type: intstr.String,
115116
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-applicationset-controller"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-applicationset-controller"), test.argocd.Namespace),
116117
},
117-
For: "5m",
118+
For: ptr.To((monitoringv1.Duration)("5m")),
118119
Labels: map[string]string{
119120
"severity": "warning",
120121
},
@@ -128,7 +129,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
128129
Type: intstr.String,
129130
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-dex-server"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-dex-server"), test.argocd.Namespace),
130131
},
131-
For: "5m",
132+
For: ptr.To((monitoringv1.Duration)("5m")),
132133
Labels: map[string]string{
133134
"severity": "warning",
134135
},
@@ -142,7 +143,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
142143
Type: intstr.String,
143144
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-notifications-controller"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-notifications-controller"), test.argocd.Namespace),
144145
},
145-
For: "5m",
146+
For: ptr.To((monitoringv1.Duration)("5m")),
146147
Labels: map[string]string{
147148
"severity": "warning",
148149
},
@@ -156,7 +157,7 @@ func TestReconcileWorkloadStatusAlertRule(t *testing.T) {
156157
Type: intstr.String,
157158
StrVal: fmt.Sprintf("kube_deployment_status_replicas{deployment=\"%s\", namespace=\"%s\"} != kube_deployment_status_replicas_ready{deployment=\"%s\", namespace=\"%s\"} ", fmt.Sprintf(test.argocd.Name+"-redis"), test.argocd.Namespace, fmt.Sprintf(test.argocd.Name+"-redis"), test.argocd.Namespace),
158159
},
159-
For: "5m",
160+
For: ptr.To((monitoringv1.Duration)("5m")),
160161
Labels: map[string]string{
161162
"severity": "warning",
162163
},

‎controllers/argocd/util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ import (
3939
"github.com/argoproj-labs/argocd-operator/common"
4040
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
4141

42-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
4342
oappsv1 "github.com/openshift/api/apps/v1"
4443
configv1 "github.com/openshift/api/config/v1"
4544
routev1 "github.com/openshift/api/route/v1"
4645
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
46+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
4747
"github.com/sethvargo/go-password/password"
4848
"golang.org/x/mod/semver"
4949
appsv1 "k8s.io/api/apps/v1"

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
// ref: https://github.com/argoproj-labs/argocd-operator/pull/1606#issuecomment-2490948356
88
github.com/argoproj/argo-cd/v2 v2.12.10
99
github.com/cert-manager/cert-manager v1.14.4
10-
github.com/coreos/prometheus-operator v0.40.0
1110
github.com/go-logr/logr v1.4.2
1211
github.com/google/go-cmp v0.6.0
1312
github.com/json-iterator/go v1.1.12
@@ -16,6 +15,7 @@ require (
1615
github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa
1716
github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb
1817
github.com/pkg/errors v0.9.1
18+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
1919
github.com/prometheus/client_golang v1.21.0
2020
github.com/sethvargo/go-password v0.3.1
2121
github.com/stretchr/testify v1.10.0
@@ -26,6 +26,7 @@ require (
2626
k8s.io/apimachinery v0.29.6
2727
k8s.io/client-go v12.0.0+incompatible
2828
k8s.io/kube-aggregator v0.29.6
29+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
2930
sigs.k8s.io/controller-runtime v0.17.2
3031
)
3132

@@ -35,21 +36,21 @@ require (
3536
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3637
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3738
github.com/dlclark/regexp2 v1.11.2 // indirect
38-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
3940
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
40-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
41+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4142
github.com/fsnotify/fsnotify v1.7.0 // indirect
4243
github.com/go-logr/zapr v1.3.0 // indirect
43-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
44-
github.com/go-openapi/jsonreference v0.20.4 // indirect
45-
github.com/go-openapi/swag v0.22.7 // indirect
44+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
45+
github.com/go-openapi/jsonreference v0.21.0 // indirect
46+
github.com/go-openapi/swag v0.23.0 // indirect
4647
github.com/gobwas/glob v0.2.3 // indirect
4748
github.com/gogo/protobuf v1.3.2 // indirect
4849
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4950
github.com/golang/protobuf v1.5.4 // indirect
5051
github.com/google/gnostic-models v0.6.8 // indirect
5152
github.com/google/gofuzz v1.2.0 // indirect
52-
github.com/google/uuid v1.5.0 // indirect
53+
github.com/google/uuid v1.6.0 // indirect
5354
github.com/imdario/mergo v0.3.16 // indirect
5455
github.com/josharian/intern v1.0.0 // indirect
5556
github.com/klauspost/compress v1.17.11 // indirect
@@ -80,9 +81,8 @@ require (
8081
gopkg.in/yaml.v3 v3.0.1 // indirect
8182
k8s.io/apiextensions-apiserver v0.29.6 // indirect
8283
k8s.io/component-base v0.29.6 // indirect
83-
k8s.io/klog/v2 v2.110.1 // indirect
84-
k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
85-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
84+
k8s.io/klog/v2 v2.120.1 // indirect
85+
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
8686
sigs.k8s.io/gateway-api v1.0.0 // indirect
8787
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8888
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)