Skip to content

Allow to deploy a list of cinder-backup services #575

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

Merged
openshift-merge-bot merged 2 commits into from
Dec 15, 2025
+634 −53
Merged

Allow to deploy a list of cinder-backup services #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f2478
Update cinder-backup API to support multiple backup services
fmount Nov 12, 2025
387a471
Add webhooks to prevent using both CinderBackup APIs
fmount Nov 12, 2025
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
2 changes: 1 addition & 1 deletion api/bases/cinder.openstack.org_cinderapis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion api/bases/cinder.openstack.org_cinderbackups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down
141 changes: 137 additions & 4 deletions api/bases/cinder.openstack.org_cinders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down Expand Up @@ -377,7 +377,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down Expand Up @@ -488,6 +488,133 @@ spec:
required:
- containerImage
type: object
cinderBackups:
additionalProperties:
description: CinderBackupTemplate defines the input parameters for
the Cinder Backup service
properties:
containerImage:
description: ContainerImage - Cinder Container Image URL (will
be set to environmental default if empty)
type: string
customServiceConfig:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
CustomServiceConfigSecrets - customize the service config using this parameter to specify Secrets
that contain sensitive service config data. The content of each Secret gets added to the
/etc/<service>/<service>.conf.d directory as a custom config file.
items:
type: string
type: array
networkAttachments:
description: NetworkAttachments is a list of NetworkAttachment
resource names to expose the services to the given network
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
description: |-
NodeSelector to target subset of worker nodes running this service. Setting here overrides
any global NodeSelector settings within the Cinder CR.
type: object
replicas:
default: 1
description: Replicas - Cinder Backup Replicas
format: int32
minimum: 0
type: integer
resources:
description: |-
Resources - Compute Resources required by this service (Limits/Requests).
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
properties:
claims:
description: |-
Claims lists the names of resources, defined in spec.resourceClaims,
that are used by this container.

This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate.

This field is immutable. It can only be set for containers.
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: |-
Name must match the name of one entry in pod.spec.resourceClaims of
the Pod where this field is used. It makes that resource available
inside a container.
type: string
request:
description: |-
Request is the name chosen for a request in the referenced claim.
If empty, everything from the claim is made available, otherwise
only the result of this request.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: |-
Limits describes the maximum amount of compute resources allowed.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: |-
Requests describes the minimum amount of compute resources required.
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
otherwise to an implementation-defined value. Requests cannot exceed Limits.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
type: object
type: object
topologyRef:
description: |-
TopologyRef to apply the Topology defined by the associated CR referenced
by name
properties:
name:
description: Name - The Topology CR name that the Service
references
type: string
namespace:
description: |-
Namespace - The Namespace to fetch the Topology CR referenced
NOTE: Namespace currently points by default to the same namespace where
the Service is deployed. Customizing the namespace is not supported and
webhooks prevent editing this field to a value different from the
current project
type: string
type: object
required:
- containerImage
type: object
description: CinderBackups - Spec definition for the Backup service
of this Cinder deployment
type: object
cinderScheduler:
description: CinderScheduler - Spec definition for the Scheduler service
of this Cinder deployment
Expand All @@ -500,7 +627,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down Expand Up @@ -624,7 +751,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down Expand Up @@ -1988,6 +2115,12 @@ spec:
format: int32
minimum: 0
type: integer
cinderBackupsReadyCounts:
additionalProperties:
format: int32
type: integer
description: ReadyCounts of Cinder Backup instances
type: object
cinderSchedulerReadyCount:
default: 0
description: ReadyCount of Cinder Scheduler instance
Expand Down
2 changes: 1 addition & 1 deletion api/bases/cinder.openstack.org_cinderschedulers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion api/bases/cinder.openstack.org_cindervolumes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
description: |-
CustomServiceConfig - customize the service config using this parameter to change service defaults,
or overwrite rendered information using raw OpenStack config format. The content gets added to
to /etc/<service>/<service>.conf.d directory as a custom config file.
the /etc/<service>/<service>.conf.d directory as a custom config file.
type: string
customServiceConfigSecrets:
description: |-
Expand Down
16 changes: 15 additions & 1 deletion api/v1beta1/cinder_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,17 @@ type CinderSpecCore struct {
// CinderScheduler - Spec definition for the Scheduler service of this Cinder deployment
CinderScheduler CinderSchedulerTemplateCore `json:"cinderScheduler"`

// CinderBackup is DEPRECATED and will be removed in a future release.
// Use the separate CinderBackups resource instead.
// +kubebuilder:validation:Optional
// CinderBackup - Spec definition for the Backup service of this Cinder deployment
// +kubebuilder:deprecated:true
// +kubebuilder:deprecatedversion:warning="Cinder.Spec.CinderBackup is deprecated, use CinderBackups instead"
CinderBackup CinderBackupTemplateCore `json:"cinderBackup"`

// +kubebuilder:validation:Optional
// CinderBackups - Spec definition for the Backup service of this Cinder deployment
CinderBackups *map[string]CinderBackupTemplateCore `json:"cinderBackups,omitempty"`

// +kubebuilder:validation:Optional
// CinderVolumes - Map of chosen names to spec definitions for the Volume(s) service(s) of this Cinder deployment
CinderVolumes map[string]CinderVolumeTemplateCore `json:"cinderVolumes,omitempty"`
Expand All @@ -153,6 +160,10 @@ type CinderSpec struct {
// CinderBackup - Spec definition for the Backup service of this Cinder deployment
CinderBackup CinderBackupTemplate `json:"cinderBackup"`

// +kubebuilder:validation:Optional
// CinderBackups - Spec definition for the Backup service of this Cinder deployment
CinderBackups *map[string]CinderBackupTemplate `json:"cinderBackups,omitempty"`

// +kubebuilder:validation:Optional
// CinderVolumes - Map of chosen names to spec definitions for the Volume(s) service(s) of this Cinder deployment
CinderVolumes map[string]CinderVolumeTemplate `json:"cinderVolumes,omitempty"`
Expand Down Expand Up @@ -191,6 +202,9 @@ type CinderStatus struct {
// +kubebuilder:default=0
CinderBackupReadyCount int32 `json:"cinderBackupReadyCount"`

// ReadyCounts of Cinder Backup instances
CinderBackupsReadyCounts map[string]int32 `json:"cinderBackupsReadyCounts,omitempty"`

// ReadyCount of Cinder Scheduler instance
// +kubebuilder:validation:Minimum=0
// +kubebuilder:default=0
Expand Down
Loading