From 36b33a7971e21c853766c575e1d4136cb1971523 Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Wed, 8 Apr 2026 13:14:44 +0200 Subject: [PATCH] Remove dependency on rabbitmq-cluster-operator Switch RabbitMQ scrape config discovery from rabbitmq.com/RabbitmqCluster (rabbitmq-cluster-operator) to rabbitmq.openstack.org/RabbitMq (infra-operator), following the removal of the rabbitmq-cluster-operator from infra-operator in openstack-k8s-operators/infra-operator#551. - Replace rabbitmq/cluster-operator imports with infra-operator rabbitmq/v1beta1 - Update RBAC from rabbitmq.com/rabbitmqclusters to rabbitmq.openstack.org/rabbitmqs - Remove rabbitmqclusterv1 scheme registration - Bump infra-operator, keystone-operator, and heat-operator Co-Authored-By: Claude Opus 4.6 --- api/go.mod | 7 +---- api/go.sum | 7 ++--- cmd/main.go | 2 -- config/rbac/role.yaml | 4 +-- go.mod | 16 ++++-------- go.sum | 26 +++++++------------ .../controller/metricstorage_controller.go | 6 ++--- internal/metricstorage/scrape_config.go | 4 +-- 8 files changed, 25 insertions(+), 47 deletions(-) diff --git a/api/go.mod b/api/go.mod index b7b6817eb..f1ed3bcf1 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,7 +4,7 @@ go 1.24.4 require ( github.com/onsi/gomega v1.39.1 - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511 + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260408075848-a2ebc6b245c3 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d github.com/rhobs/observability-operator v1.0.0 k8s.io/api v0.31.14 @@ -43,7 +43,6 @@ require ( github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.65.0 // indirect github.com/prometheus/procfs v0.16.1 // indirect - github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect github.com/spf13/pflag v1.0.7 // indirect github.com/x448/float16 v0.8.4 // indirect @@ -71,7 +70,6 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect ) -// pin these to avoid later versions pulled by rabbitmq replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging @@ -88,7 +86,4 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging -// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches) -replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging - replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging diff --git a/api/go.sum b/api/go.sum index 729bf9500..e81d428a2 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,4 +1,3 @@ -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -79,12 +78,10 @@ github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28= github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511 h1:W7AlsQoccL1UtW9FqF82Owz/8n8hmJ29/X5+2bCRUHQ= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511/go.mod h1:EKtKXGi4O7t/oExH1rGylTHAO5/LasNrf40a3ATT6uI= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260408075848-a2ebc6b245c3 h1:8ZMsz5HoyKfsZJNISxGXUqAbYXRw4LGmepVVPunIYKQ= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260408075848-a2ebc6b245c3/go.mod h1:c6jkCYVpYXazuRYxq7UEa+P+gKCSo5bFB85QvZf6nIg= github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d h1:qbH09BzypLy1+N133JVgfkRmDZaQKpDLwi/InqqOzGM= github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d/go.mod h1:XUUV+h1nZC4kra5oF+cXPkviWYJ3ELhccHxnVO7CvQQ= -github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc= -github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/cmd/main.go b/cmd/main.go index d87581963..9324c745b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -58,7 +58,6 @@ import ( "github.com/openstack-k8s-operators/lib-common/modules/common/operator" mariadbv1beta1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - rabbitmqclusterv1 "github.com/rabbitmq/cluster-operator/api/v1beta1" monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1" monv1alpha1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1alpha1" obov1 "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1" @@ -87,7 +86,6 @@ func init() { utilruntime.Must(heatv1.AddToScheme(scheme)) utilruntime.Must(ovnv1.AddToScheme(scheme)) utilruntime.Must(infranetworkv1.AddToScheme(scheme)) - utilruntime.Must(rabbitmqclusterv1.AddToScheme(scheme)) utilruntime.Must(networkv1.AddToScheme(scheme)) utilruntime.Must(topologyv1.AddToScheme(scheme)) utilruntime.Must(lokistackv1.AddToScheme(scheme)) diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 7a8c2674a..52a7b216d 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -263,9 +263,9 @@ rules: - list - watch - apiGroups: - - rabbitmq.com + - rabbitmq.openstack.org resources: - - rabbitmqclusters + - rabbitmqs verbs: - get - list diff --git a/go.mod b/go.mod index fa998a4b6..c18449268 100644 --- a/go.mod +++ b/go.mod @@ -10,16 +10,15 @@ require ( github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7 github.com/onsi/gomega v1.39.1 - github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260328071427-ab8ab6bb163b - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511 - github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f + github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260408110147-107d54e5558c + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260408075848-a2ebc6b245c3 + github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260407135110-a78ddc515b34 github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20260331122750-ecff41ebb61d github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260331122750-ecff41ebb61d github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260403163210-0e5eb2ea6a9c github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260402040941-c0c67dde993d github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240529090522-c780bd90b147 - github.com/rabbitmq/cluster-operator v1.14.0 github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 github.com/rhobs/observability-operator v1.0.0 k8s.io/api v0.31.14 @@ -66,14 +65,13 @@ require ( github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260320125710-3a5f82ff0f18 // indirect - github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260326092926-8a2950f0575b // indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260331122750-ecff41ebb61d // indirect + github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260331122750-ecff41ebb61d // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.22.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.65.0 // indirect github.com/prometheus/procfs v0.16.1 // indirect - github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect github.com/spf13/cobra v1.9.1 // indirect github.com/spf13/pflag v1.0.7 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect @@ -125,7 +123,6 @@ require ( // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging -// pin these to avoid later versions pulled by rabbitmq replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging @@ -142,7 +139,4 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging -// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches) -replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging - replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging diff --git a/go.sum b/go.sum index afd473029..d7a7a8e74 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= @@ -45,7 +44,6 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU= github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -111,28 +109,26 @@ github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28= github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg= github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U= github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo= -github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260328071427-ab8ab6bb163b h1:5EgNwXLLyurP49UDQW7BkBQVuL0ir+G8K68JtNDLS6w= -github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260328071427-ab8ab6bb163b/go.mod h1:P6x0NoadjMOG+4OUltsQIjVBnuKKNdQ7tNT/RgPy1HQ= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511 h1:W7AlsQoccL1UtW9FqF82Owz/8n8hmJ29/X5+2bCRUHQ= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511/go.mod h1:EKtKXGi4O7t/oExH1rGylTHAO5/LasNrf40a3ATT6uI= -github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f h1:60I2YLHRznTY2BQXqXWc+ByJ3ipdQgKgW52t9J8C5DY= -github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f/go.mod h1:8o6LSPt1VAvvB2ngS2QObGS6HEikSdVpHoKIgmb78KI= +github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260408110147-107d54e5558c h1:2h0X08U59pOehJk4mLPjH+PPhq0d2fc9nfZekJwqJso= +github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260408110147-107d54e5558c/go.mod h1:j54hOFZGSuE3GN2kzo2i/s9qITVYzWnoPz9GoWMPh8A= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260408075848-a2ebc6b245c3 h1:8ZMsz5HoyKfsZJNISxGXUqAbYXRw4LGmepVVPunIYKQ= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260408075848-a2ebc6b245c3/go.mod h1:c6jkCYVpYXazuRYxq7UEa+P+gKCSo5bFB85QvZf6nIg= +github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260407135110-a78ddc515b34 h1:tAFN85AfkmPYLpW3U8iLl5hfWkr+Siu5zmPFQcHT0bA= +github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260407135110-a78ddc515b34/go.mod h1:++AfiztecGZPtciv6fe6tFrRcBq2TbLLg70mp+tTXx0= github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20260331122750-ecff41ebb61d h1:4gUAYX5sgNwXm/bMFm8nbuGLyAslZTVcts4N3Mc84hY= github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20260331122750-ecff41ebb61d/go.mod h1:tXxVkkk8HlATwTmDA5RTP3b+c8apfuMM15mZ2wW5iNs= github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260331122750-ecff41ebb61d h1:BzD2CQQaWC0VEYxqsEFrJgZ2Wh692JMdVCuH/7CPWmY= github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260331122750-ecff41ebb61d/go.mod h1:GzD7Jc5o98ptJ97DSjhC0CQ6OiTP0PB/2qJqxYGcOH8= github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d h1:qbH09BzypLy1+N133JVgfkRmDZaQKpDLwi/InqqOzGM= github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d/go.mod h1:XUUV+h1nZC4kra5oF+cXPkviWYJ3ELhccHxnVO7CvQQ= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260320125710-3a5f82ff0f18 h1:eJDwc8LPJg+H4bHMLh/pDJBk+OezQ+wkjUNpExUFhbM= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260320125710-3a5f82ff0f18/go.mod h1:7yqbVpg0k0vW+kZks+TMU/cd1ovoejyHfVPWcyGYLHI= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260326092926-8a2950f0575b h1:zkzB4C9Yp3DzD831KfXul8rvO4Q94B+xY1faJYOsSGQ= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260326092926-8a2950f0575b/go.mod h1:3loLaPUDQyvbPekylZd9OCLF+EXH2klRI9IeeQhuMcs= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260331122750-ecff41ebb61d h1:T0U7XbP2JOJ05lEn7FhI3l05qPMP9UZJMuoURNhPsQ8= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260331122750-ecff41ebb61d/go.mod h1:7yqbVpg0k0vW+kZks+TMU/cd1ovoejyHfVPWcyGYLHI= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260331122750-ecff41ebb61d h1:veZ4DnHVufu2Dr0Vop+XSd5jQL9eIAtiLQGx6FX0Zyg= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260331122750-ecff41ebb61d/go.mod h1:3loLaPUDQyvbPekylZd9OCLF+EXH2klRI9IeeQhuMcs= github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260403163210-0e5eb2ea6a9c h1:Ia5Q1cqldbKSO6xZhmYGl3cOhdiL3qvpLAD+qjutRio= github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260403163210-0e5eb2ea6a9c/go.mod h1:gwMbEqWORY6TTW1Dk8OC4xzufRYRUYeXg0kqO1cNosE= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260402040941-c0c67dde993d h1:2RBjc4SknnHbuWQRFR9chETPmgQ42Ks6tTEDnvhQGC4= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260402040941-c0c67dde993d/go.mod h1:wtnlbYH3u8jHHKltKDCf0ILNtCe7ZnOJSreSGXCbb2w= -github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc= -github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -146,8 +142,6 @@ github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2 github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= -github.com/rabbitmq/cluster-operator v1.14.0 h1:1/nMyd9v/8T5IHA1BVcWbV0nrzN31F+gLP+0Ges6Y5E= -github.com/rabbitmq/cluster-operator v1.14.0/go.mod h1:7XVU6ngbVJSPDXld+uMVk6nu68GH7fM6yYYY2MdYKek= github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 h1:uahWdfwYHqAb28Y1WsltZsiFlIgjxI8HHQxgUdBgPYQ= github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1/go.mod h1:I9jGubP/TOORi53RNCK7yPH5cP0TAyxzrNirBhHJtoM= github.com/rhobs/observability-operator v1.0.0 h1:BqV9ZaIt7/52yJTw9xeSiQ1uo7O1A272AzgQms/uo7M= diff --git a/internal/controller/metricstorage_controller.go b/internal/controller/metricstorage_controller.go index 3fb9087a5..688cb1860 100644 --- a/internal/controller/metricstorage_controller.go +++ b/internal/controller/metricstorage_controller.go @@ -53,6 +53,7 @@ import ( networkv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" infranetworkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1" + rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" availability "github.com/openstack-k8s-operators/telemetry-operator/internal/availability" @@ -61,7 +62,6 @@ import ( metricstorage "github.com/openstack-k8s-operators/telemetry-operator/internal/metricstorage" telemetry "github.com/openstack-k8s-operators/telemetry-operator/internal/telemetry" utils "github.com/openstack-k8s-operators/telemetry-operator/internal/utils" - rabbitmqv1 "github.com/rabbitmq/cluster-operator/api/v1beta1" monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1" monv1alpha1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1alpha1" obov1 "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1" @@ -107,7 +107,7 @@ func (r *MetricStorageReconciler) GetLogger(ctx context.Context) logr.Logger { //+kubebuilder:rbac:groups=monitoring.rhobs,resources=prometheuses,verbs=get;list;watch;update;patch;delete //+kubebuilder:rbac:groups=monitoring.rhobs,resources=alertmanagers,verbs=get;list;watch;update;patch;delete //+kubebuilder:rbac:groups=network.openstack.org,resources=ipsets,verbs=get;list;watch -//+kubebuilder:rbac:groups=rabbitmq.com,resources=rabbitmqclusters,verbs=get;list;watch +//+kubebuilder:rbac:groups=rabbitmq.openstack.org,resources=rabbitmqs,verbs=get;list;watch //+kubebuilder:rbac:groups=ovn.openstack.org,resources=ovnnorthds,verbs=get;list;watch //+kubebuilder:rbac:groups=observability.openshift.io,resources=uiplugins,verbs=get;list;watch;create;patch //+kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete @@ -766,7 +766,7 @@ func (r *MetricStorageReconciler) createScrapeConfigs( } // ScrapeConfigs for RabbitMQ monitoring - rabbitList := &rabbitmqv1.RabbitmqClusterList{} + rabbitList := &rabbitmqv1.RabbitMqList{} listOpts := []client.ListOption{ client.InNamespace(instance.GetNamespace()), } diff --git a/internal/metricstorage/scrape_config.go b/internal/metricstorage/scrape_config.go index ce3c341a3..c0c87e35a 100644 --- a/internal/metricstorage/scrape_config.go +++ b/internal/metricstorage/scrape_config.go @@ -22,11 +22,11 @@ import ( "net" "sort" + rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1" helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper" tls "github.com/openstack-k8s-operators/lib-common/modules/common/tls" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" mysqldexporter "github.com/openstack-k8s-operators/telemetry-operator/internal/mysqldexporter" - rabbitmqv1 "github.com/rabbitmq/cluster-operator/api/v1beta1" monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1" monv1alpha1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1alpha1" corev1 "k8s.io/api/core/v1" @@ -105,7 +105,7 @@ func ScrapeConfigRabbitMQ( instance *telemetryv1.MetricStorage, labels map[string]string, helper *helper.Helper, - rabbit rabbitmqv1.RabbitmqCluster, + rabbit rabbitmqv1.RabbitMq, tlsEnabled bool, ) (*monv1alpha1.ScrapeConfig, error) { scrapeInterval := retrieveScrapeInterval(instance)