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
+473 −5,992
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
54 changes: 34 additions & 20 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 @@ -14138,10 +14138,25 @@ spec:
x-kubernetes-list-type: atomic
type: object
type: object
config:
properties:
additionalConfig:
type: string
additionalPlugins:
items:
type: string
type: array
x-kubernetes-list-type: atomic
advancedConfig:
type: string
envConfig:
type: string
erlangInetConfig:
type: string
type: object
delayStartSeconds:
default: 30
format: int32
minimum: 0
type: integer
nodeSelector:
additionalProperties:
Expand Down Expand Up @@ -14260,9 +14275,8 @@ spec:
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
x-kubernetes-preserve-unknown-fields: true
persistence:
default:
storage: 10Gi
properties:
storage:
anyOf:
Expand Down Expand Up @@ -14330,23 +14344,16 @@ spec:
rabbitmq:
properties:
additionalConfig:
maxLength: 100000
type: string
additionalPlugins:
items:
maxLength: 100
pattern: ^\w+$
type: string
maxItems: 100
type: array
advancedConfig:
maxLength: 100000
type: string
envConfig:
maxLength: 100000
type: string
erlangInetConfig:
maxLength: 2000
type: string
type: object
replicas:
Expand Down Expand Up @@ -14437,27 +14444,33 @@ spec:
type: string
type: object
ipFamilyPolicy:
enum:
- SingleStack
- PreferDualStack
- RequireDualStack
type: string
labels:
additionalProperties:
type: string
type: object
type:
default: ClusterIP
enum:
- ClusterIP
- LoadBalancer
- NodePort
type: string
type: object
skipPostDeploySteps:
type: boolean
storage:
properties:
storage:
anyOf:
- type: integer
- type: string
default: 10Gi
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
storageClassName:
type: string
type: object
targetVersion:
pattern: ^\d+\.\d+(\.\d+)?$
type: string
terminationGracePeriodSeconds:
default: 604800
default: 60
format: int64
minimum: 0
type: integer
Expand Down Expand Up @@ -14486,6 +14499,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.

3 changes: 2 additions & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
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-20260320164938-2057972ad9de
6 changes: 2 additions & 4 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-20260320164938-2057972ad9de h1:kapZ0xUDC+MrtXXLmqvuWQg5nxuFNoxM/EfhXhsxdnY=
github.com/lmiccini/infra-operator/apis v0.0.0-20260320164938-2057972ad9de/go.mod h1:QXzR9220I2d7CcoHqL4HWtU1PogJSN3NLmnh+bK3mco=
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,8 +128,6 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260314075609-1b8
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260314075609-1b85a36fcef9/go.mod h1:8o0wLkMYyDDqZAdvU/YKMwgwiOyQzADWrmy38rZcHyE=
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260314075038-6794e497bcfc h1:3r2wVspdAWx4j7ZScrukfLiPcGM7J9S/ClyOHsbY7ro=
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260314075038-6794e497bcfc/go.mod h1:P0hUdNDsv8ISnK2GyFogNQF+dxatbKhtQ76UKhX6t7w=
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260314122830-5d1715fa2f64 h1:1orzxWFuQH+QarnH32GXtc4GbE0efL4NddSsRFx3QYM=
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260314122830-5d1715fa2f64/go.mod h1:nC/Jf3OYJRML8UEzJ/mn/TQcSCv/nhqO6x6LGkdDt60=
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260314080422-d98151f45e34 h1:UgaEid1bqgUzsLg21BHtXSYOV2pljxR1Z3i1BcRVNQc=
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260314080422-d98151f45e34/go.mod h1:xEHdAz96FYfnBb1QAFgbfR2BCWCBIqhqKYT84IqU6zc=
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260314080138-b41734470581 h1:FntUoWPVWx8xaGCwP7kdUVT/N8Z0kfIxLLK4L+oQJ7c=
Expand All @@ -154,8 +154,6 @@ github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260314104343-4225
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260314104343-4225d7a41ec7/go.mod h1:PxLz6iV8Z3Ql2QDylxLiljfoisGptsUVWEvbcXC8I3o=
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260314091105-4ba8bc4c4955 h1:5LJ5YAEGNRZh5hVolC23bzViQoaT1P0MgRQu9xc7RRU=
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260314091105-4ba8bc4c4955/go.mod h1:+8lsJYJYsR8fBvgY4Wtvde4iY+l9O5PBPf6yhVQ1LQU=
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.20260314085148-07c5c7f39186 h1:2uSOOWJJXomiSegRgMrhbOcUQsyxEV+m7OJP4pXlCE0=
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260314085148-07c5c7f39186/go.mod h1:kOdVr5xAw1jdwYJ8P9yKaqc+qbEzKhuxvOQdPfelPdg=
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260314104344-15c2ffcfe08e h1:mjuYX0PJjdZCuXzq+S4VLmZcAZ6BgcQLm7WB1DSfd14=
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
58 changes: 38 additions & 20 deletions bindata/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14403,10 +14403,25 @@ spec:
x-kubernetes-list-type: atomic
type: object
type: object
config:
properties:
additionalConfig:
type: string
additionalPlugins:
items:
type: string
type: array
x-kubernetes-list-type: atomic
advancedConfig:
type: string
envConfig:
type: string
erlangInetConfig:
type: string
type: object
delayStartSeconds:
default: 30
format: int32
minimum: 0
type: integer
nodeSelector:
additionalProperties:
Expand Down Expand Up @@ -14525,9 +14540,8 @@ spec:
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
x-kubernetes-preserve-unknown-fields: true
persistence:
default:
storage: 10Gi
properties:
storage:
anyOf:
Expand Down Expand Up @@ -14595,23 +14609,16 @@ spec:
rabbitmq:
properties:
additionalConfig:
maxLength: 100000
type: string
additionalPlugins:
items:
maxLength: 100
pattern: ^\w+$
type: string
maxItems: 100
type: array
advancedConfig:
maxLength: 100000
type: string
envConfig:
maxLength: 100000
type: string
erlangInetConfig:
maxLength: 2000
type: string
type: object
replicas:
Expand Down Expand Up @@ -14702,27 +14709,33 @@ spec:
type: string
type: object
ipFamilyPolicy:
enum:
- SingleStack
- PreferDualStack
- RequireDualStack
type: string
labels:
additionalProperties:
type: string
type: object
type:
default: ClusterIP
enum:
- ClusterIP
- LoadBalancer
- NodePort
type: string
type: object
skipPostDeploySteps:
type: boolean
storage:
properties:
storage:
anyOf:
- type: integer
- type: string
default: 10Gi
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
storageClassName:
type: string
type: object
targetVersion:
pattern: ^\d+\.\d+(\.\d+)?$
type: string
terminationGracePeriodSeconds:
default: 604800
default: 60
format: int64
minimum: 0
type: integer
Expand Down Expand Up @@ -14751,6 +14764,7 @@ spec:
type: string
type: object
type: array
x-kubernetes-list-type: atomic
topologyRef:
properties:
name:
Expand Down Expand Up @@ -21465,6 +21479,8 @@ spec:
properties:
glanceWsgi:
type: string
rabbitmqVersion:
type: string
type: object
type: object
availableVersion:
Expand Down Expand Up @@ -21900,6 +21916,8 @@ spec:
properties:
glanceWsgi:
type: string
rabbitmqVersion:
type: string
type: object
trackedCustomImages:
additionalProperties:
Expand Down
Loading
Loading