Skip to content

Drop rabbitmq-cluster-operator and add rabbitmq version label #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lmiccini wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drop rabbitmq-cluster-operator and add rabbitmq version label #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ bindata: kustomize yq ## Call sync bindata script
sed -i bindata/operator/operator.yaml -e "/customRequests/c\\ cpu: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.CPU }}\n memory: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.Memory }}"
sed -i bindata/operator/operator.yaml -e "/customTolerations/c\\ tolerations:\n{{- range .OpenStackOperator.Deployment.Tolerations }}\n - key: \"{{ .Key }}\"\n{{- if .Operator }}\n operator: \"{{ .Operator }}\"\n{{- end }}\n{{- if .Value }}\n value: \"{{ .Value }}\"\n{{- end }}\n{{- if .Effect }}\n effect: \"{{ .Effect }}\"\n{{- end }}\n{{- if .TolerationSeconds }}\n tolerationSeconds: {{ .TolerationSeconds }}\n{{- end }}\n{{- end }}"
cp config/operator/managers.yaml bindata/operator/
cp config/operator/rabbit.yaml bindata/operator/
$(KUSTOMIZE) build config/rbac > bindata/rbac/rbac.yaml
/bin/bash hack/sync-bindata.sh

Expand Down
12 changes: 9 additions & 3 deletions api/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14264,8 +14264,6 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
persistence:
default:
storage: 10Gi
properties:
storage:
anyOf:
Expand Down Expand Up @@ -14329,6 +14327,10 @@ spec:
x-kubernetes-list-type: atomic
type: object
queueType:
enum:
- Mirrored
- Quorum
- ""
type: string
rabbitmq:
properties:
Expand Down Expand Up @@ -14459,8 +14461,11 @@ spec:
type: object
skipPostDeploySteps:
type: boolean
targetVersion:
pattern: ^\d+\.\d+(\.\d+)?$
type: string
terminationGracePeriodSeconds:
default: 604800
default: 60
format: int64
minimum: 0
type: integer
Expand Down Expand Up @@ -14489,6 +14494,7 @@ spec:
type: string
type: object
type: array
x-kubernetes-list-type: atomic
topologyRef:
properties:
name:
Expand Down
4 changes: 4 additions & 0 deletions api/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ spec:
properties:
glanceWsgi:
type: string
rabbitmqVersion:
type: string
type: object
type: object
availableVersion:
Expand Down Expand Up @@ -685,6 +687,8 @@ spec:
properties:
glanceWsgi:
type: string
rabbitmqVersion:
type: string
type: object
trackedCustomImages:
additionalProperties:
Expand Down
1 change: 0 additions & 1 deletion api/bases/operator.openstack.org_openstacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ spec:
- openstack-baremetal
- ovn
- placement
- rabbitmq-cluster
- swift
- telemetry
- test
Expand Down
3 changes: 2 additions & 1 deletion api/core/v1beta1/openstackversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ type ContainerTemplate struct {
// ServiceDefaults - struct that contains defaults for OSP services that can change over time
// but are associated with a specific OpenStack release version
type ServiceDefaults struct {
GlanceWsgi *string `json:"glanceWsgi,omitempty"`
GlanceWsgi *string `json:"glanceWsgi,omitempty"`
RabbitmqVersion *string `json:"rabbitmqVersion,omitempty"`
}

// OpenStackVersionStatus defines the observed state of OpenStackVersion
Expand Down
5 changes: 5 additions & 0 deletions api/core/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260316100655-863ae03d41af
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260321081258-5c806856eeb6
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260324115114-e3be8a47a45e
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260324115114-e3be8a47a45e
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260321081547-64d64a0c02c7
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-85bcf5293c70
Expand Down Expand Up @@ -86,7 +86,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/robfig/cron/v3 v3.0.1 // indirect
github.com/spf13/pflag v1.0.9 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand Down Expand Up @@ -143,3 +142,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging

replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging

replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260402125746-e4e3813a70bd
10 changes: 4 additions & 6 deletions api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/lmiccini/infra-operator/apis v0.0.0-20260402125746-e4e3813a70bd h1:OGE9YIS3EfOXi52DUszLTGutQ6UL1Yi2HJzjsyscl6Q=
github.com/lmiccini/infra-operator/apis v0.0.0-20260402125746-e4e3813a70bd/go.mod h1:c6jkCYVpYXazuRYxq7UEa+P+gKCSo5bFB85QvZf6nIg=
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
Expand Down Expand Up @@ -126,14 +128,12 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260321081011-0ad
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260321081011-0ad5f7292fb5/go.mod h1:D/clVT1Pf25PC/N2SEQiB2QQO/TF2IBCOPT5VkNkhHQ=
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260321080731-03e8ffbd65e3 h1:t80wfV1UAjxA0ey3LHRsiJgoL6OEuBqOjqU6yvn7nOg=
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260321080731-03e8ffbd65e3/go.mod h1:qQ7Ie2fWv5PnlffsAWlv6Y7jUgFbG0WQVZHCOgS0d/Y=
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260316100655-863ae03d41af h1:Ow12j/PVbEtul1bZ7s/ZenVnKPIHK2q+0VgTp+j/wro=
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260316100655-863ae03d41af/go.mod h1:nC/Jf3OYJRML8UEzJ/mn/TQcSCv/nhqO6x6LGkdDt60=
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260321081258-5c806856eeb6 h1:8jpYazj7pGgzomNtQFL+BW5VxtDjRMfNJ7pTd53+5fw=
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260321081258-5c806856eeb6/go.mod h1:y5Er36n6rjQA2Gi3dtwamhyeqWTGBIszN+ZexsvJCIo=
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/lib-common/modules/common v0.6.1-0.20260324115114-e3be8a47a45e h1:mHKwo8Cg9xHRRShBtJfcPYdE7FaivrgRBegEMDgv7fY=
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260324115114-e3be8a47a45e/go.mod h1:XUUV+h1nZC4kra5oF+cXPkviWYJ3ELhccHxnVO7CvQQ=
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.20260324115114-e3be8a47a45e h1:KpBZFtg8RnE9F6uINOEH7c9Zgp8HIl5+haHLv3IFEGk=
Expand All @@ -154,8 +154,6 @@ github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260324093450-6c7a
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260324093450-6c7afb9e632f/go.mod h1:y6h5ocsFHUUTYAAlYibfHMUzbx2di0cN93yGTTbvMNY=
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260321143858-aaffa49d81f5 h1:/fQT4PDa30kz1k9dB48WcWHhEE1OP7hRXJuuURNGivo=
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260321143858-aaffa49d81f5/go.mod h1:IuKiktN8yyVTD6T57XZN9Cbx0ZFIU+gwO4OLFa8nxu8=
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/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260321143859-b86b733f44bb h1:uEZZguEl/iVOlXkGiWkVK+29k+S++w83FxGICUSKlaw=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260321143859-b86b733f44bb/go.mod h1:81OMzM3nKYvmpYrQ4egBzwiMjsh6To+eY8bFzW0zyoA=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260324101924-e6b1d6cc59cd h1:BSn3UxztfqM/Z0X9pgMG+NPh0JV9KtBqpqP0eFaWhOw=
Expand Down
18 changes: 1 addition & 17 deletions api/operator/v1beta1/openstack_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const (
OpenStackBaremetalOperatorName = "openstack-baremetal"
OvnOperatorName = "ovn"
PlacementOperatorName = "placement"
RabbitMQOperatorName = "rabbitmq-cluster"
SwiftOperatorName = "swift"
TelemetryOperatorName = "telemetry"
TestOperatorName = "test"
Expand Down Expand Up @@ -161,21 +160,6 @@ var (
{
Name: PlacementOperatorName,
},
{
Name: RabbitMQOperatorName,
ControllerManager: ContainerSpec{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("5m"),
corev1.ResourceMemory: resource.MustParse("64Mi"),
},
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("200m"),
corev1.ResourceMemory: resource.MustParse("500Mi"),
},
},
},
},
{
Name: SwiftOperatorName,
},
Expand Down Expand Up @@ -204,7 +188,7 @@ type OpenStackSpec struct {
type OperatorSpec struct {
// +kubebuilder:validation:Required
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:Enum:=openstack;barbican;cinder;designate;glance;heat;horizon;infra;ironic;keystone;manila;mariadb;neutron;nova;octavia;openstack-baremetal;ovn;placement;rabbitmq-cluster;swift;telemetry;test;watcher
// +kubebuilder:validation:Enum:=openstack;barbican;cinder;designate;glance;heat;horizon;infra;ironic;keystone;manila;mariadb;neutron;nova;octavia;openstack-baremetal;ovn;placement;swift;telemetry;test;watcher
// Name of the service operators.
Name string `json:"name"`

Expand Down
16 changes: 13 additions & 3 deletions bindata/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14529,8 +14529,6 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
persistence:
default:
storage: 10Gi
properties:
storage:
anyOf:
Expand Down Expand Up @@ -14594,6 +14592,10 @@ spec:
x-kubernetes-list-type: atomic
type: object
queueType:
enum:
- Mirrored
- Quorum
- ""
type: string
rabbitmq:
properties:
Expand Down Expand Up @@ -14724,8 +14726,11 @@ spec:
type: object
skipPostDeploySteps:
type: boolean
targetVersion:
pattern: ^\d+\.\d+(\.\d+)?$
type: string
terminationGracePeriodSeconds:
default: 604800
default: 60
format: int64
minimum: 0
type: integer
Expand Down Expand Up @@ -14754,6 +14759,7 @@ spec:
type: string
type: object
type: array
x-kubernetes-list-type: atomic
topologyRef:
properties:
name:
Expand Down Expand Up @@ -21468,6 +21474,8 @@ spec:
properties:
glanceWsgi:
type: string
rabbitmqVersion:
type: string
type: object
type: object
availableVersion:
Expand Down Expand Up @@ -21903,6 +21911,8 @@ spec:
properties:
glanceWsgi:
type: string
rabbitmqVersion:
type: string
type: object
trackedCustomImages:
additionalProperties:
Expand Down
Loading
Loading