Skip to content

Commit b3e573f

Browse files
committed
bug: Downgrade Prometheus Operator to same as gitops-operator
Signed-off-by: Jonathan West <[email protected]>
1 parent c132cfa commit b3e573f

File tree

10 files changed

+1955
-93
lines changed

10 files changed

+1955
-93
lines changed

config/rbac/role.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ rules:
4747
- get
4848
- list
4949
- watch
50+
- apiGroups:
51+
- apiextensions.k8s.io
52+
resources:
53+
- customresourcedefinitions
54+
verbs:
55+
- get
56+
- list
57+
- watch
5058
- apiGroups:
5159
- apisix.apache.org
5260
resources:

controllers/argorollouts_controller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121

2222
rolloutsmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
23-
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
23+
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
2424
appsv1 "k8s.io/api/apps/v1"
2525
corev1 "k8s.io/api/core/v1"
2626
rbacv1 "k8s.io/api/rbac/v1"
@@ -85,6 +85,7 @@ const (
8585
//+kubebuilder:rbac:groups="apisix.apache.org",resources=apisixroutes,verbs=watch;get;update
8686
//+kubebuilder:rbac:groups="route.openshift.io",resources=routes,verbs=create;watch;get;update;patch;list
8787
//+kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=create;watch;get;update;patch;list
88+
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch;
8889

8990
// Reconcile is part of the main kubernetes reconciliation loop which aims to
9091
// move the current state of the cluster closer to the desired state.

controllers/resources.go

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

88
rolloutsmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
9-
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
9+
monitoringv1 "github.com/coreos/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/resources_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"fmt"
66

77
"github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
8+
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
89
. "github.com/onsi/ginkgo/v2"
910
. "github.com/onsi/gomega"
10-
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1111
corev1 "k8s.io/api/core/v1"
1212
rbacv1 "k8s.io/api/rbac/v1"
1313
crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

controllers/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55

66
rolloutsmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
7-
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
7+
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
88

99
. "github.com/onsi/ginkgo/v2"
1010
. "github.com/onsi/gomega"

go.mod

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ module github.com/argoproj-labs/argo-rollouts-manager
33
go 1.21
44

55
require (
6+
github.com/coreos/prometheus-operator v0.40.0
67
github.com/go-logr/logr v1.2.4
78
github.com/onsi/ginkgo/v2 v2.11.0
89
github.com/onsi/gomega v1.27.10
9-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.50.0
1010
go.uber.org/zap v1.25.0
1111
gopkg.in/yaml.v2 v2.4.0
1212
k8s.io/api v0.28.3
1313
k8s.io/apiextensions-apiserver v0.28.3
1414
k8s.io/apimachinery v0.28.3
15-
k8s.io/client-go v0.28.3
15+
k8s.io/client-go v12.0.0+incompatible
1616
sigs.k8s.io/controller-runtime v0.16.3
1717
sigs.k8s.io/yaml v1.3.0
1818
)
@@ -54,7 +54,7 @@ require (
5454
github.com/rogpeppe/go-internal v1.11.0 // indirect
5555
github.com/spf13/pflag v1.0.5 // indirect
5656
go.uber.org/multierr v1.11.0 // indirect
57-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
57+
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
5858
golang.org/x/net v0.23.0 // indirect
5959
golang.org/x/oauth2 v0.10.0 // indirect
6060
golang.org/x/sys v0.18.0 // indirect
@@ -74,3 +74,36 @@ require (
7474
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7575
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7676
)
77+
78+
replace (
79+
cloud.google.com/go => cloud.google.com/go v0.100.2
80+
k8s.io/api => k8s.io/api v0.28.3
81+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.3
82+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
83+
k8s.io/apiserver => k8s.io/apiserver v0.28.3
84+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.3
85+
k8s.io/client-go => k8s.io/client-go v0.28.3 // Required by prometheus-operator
86+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.3
87+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.3
88+
k8s.io/code-generator => k8s.io/code-generator v0.28.3
89+
k8s.io/component-base => k8s.io/component-base v0.28.3
90+
k8s.io/component-helpers => k8s.io/component-helpers v0.28.3
91+
k8s.io/controller-manager => k8s.io/controller-manager v0.28.3
92+
k8s.io/cri-api => k8s.io/cri-api v0.28.3
93+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.3
94+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.3
95+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.3
96+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
97+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.3
98+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.3
99+
k8s.io/kubectl => k8s.io/kubectl v0.28.3
100+
k8s.io/kubelet => k8s.io/kubelet v0.28.3
101+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.3
102+
k8s.io/metrics => k8s.io/metrics v0.28.3
103+
k8s.io/mount-utils => k8s.io/mount-utils v0.28.3
104+
k8s.io/node-api => k8s.io/node-api v0.28.3
105+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.3
106+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.3
107+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.3
108+
k8s.io/sample-controller => k8s.io/sample-controller v0.28.3
109+
)

0 commit comments

Comments
 (0)