diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index f8e3eb939..6bb4d98e6 100644 --- a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -61,6 +61,23 @@ spec: cloudUserName: default: cloud-admin type: string + ctlplaneBond: + properties: + bondInterfaces: + items: + type: string + minItems: 2 + type: array + bondMode: + default: active-backup + type: string + bondOptions: + additionalProperties: + type: string + type: object + required: + - bondInterfaces + type: object ctlplaneInterface: type: string deploymentSSHSecret: diff --git a/apis/go.mod b/apis/go.mod index c5a4c8d61..1d3ab471e 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -23,7 +23,7 @@ require ( github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20251103113532-c4a3d7916c65 github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251103074111-0ec969e832ad github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251112213455-aa03725e0f2b - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251112191014-b4c8cca9b6fc + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251113131806-5029e383a1e5 github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251112201103-7583889cdb89 github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251112213455-cc9071dc6aa0 diff --git a/apis/go.sum b/apis/go.sum index 05f2ba947..a18a21640 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -148,8 +148,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251103074111-0ec github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251103074111-0ec969e832ad/go.mod h1:4Bp2ias9AUXvPBOSOlEkuuegDkAcJEYB9K1UtmX4q8c= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251112213455-aa03725e0f2b h1:j4S0Ir3U5SeBK1m5bdkHa27X8inJkWogDQ20bgOlHiE= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251112213455-aa03725e0f2b/go.mod h1:itmNEGzWRK3aQEIfmGENWEtDRVOporqOqqzX+JOwGJg= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251112191014-b4c8cca9b6fc h1:YLyj7+T5JDW9CSxc0GFWGxNHurLkwqLxZoUi/hv9hVg= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251112191014-b4c8cca9b6fc/go.mod h1:xCA4HMEiU8jvL+Y2/5V+z7sNpszjnCPNWy+JaCOmsBc= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251113131806-5029e383a1e5 h1:1q54oiyxF7z11M9Fsf9JFv3NWbTjWQzuPBYT8Mp5Ry0= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251113131806-5029e383a1e5/go.mod h1:xCA4HMEiU8jvL+Y2/5V+z7sNpszjnCPNWy+JaCOmsBc= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0 h1:r+s+puu/50Ca0Hw7BFQE25GNu/pI/bDClX8vZx0SVTQ= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0/go.mod h1:7QF+qByM+6rC2iy7VfeaZmLPCau1jKPcXQAEahMoz1Y= github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251112201103-7583889cdb89 h1:5Rzc3Y3oizFVY6p+cRBZ/dPiKQ/y5xkwIaCX/s5tsP0= diff --git a/bindata/crds/baremetal.openstack.org_openstackbaremetalsets.yaml b/bindata/crds/baremetal.openstack.org_openstackbaremetalsets.yaml index e842931b3..5129b2e06 100644 --- a/bindata/crds/baremetal.openstack.org_openstackbaremetalsets.yaml +++ b/bindata/crds/baremetal.openstack.org_openstackbaremetalsets.yaml @@ -146,6 +146,28 @@ spec: default: cloud-admin description: CloudUser to be configured for remote access type: string + ctlplaneBond: + description: CtlplaneBond - Bonding configuration for ctlplane network + properties: + bondInterfaces: + description: BondInterfaces - List of physical interfaces to bond + items: + type: string + minItems: 2 + type: array + bondMode: + default: active-backup + description: BondMode - Bonding mode (e.g., active-backup, 802.3ad) + type: string + bondOptions: + additionalProperties: + type: string + description: BondOptions - Additional bonding options as key-value + pairs + type: object + required: + - bondInterfaces + type: object ctlplaneGateway: description: 'CtlplaneGateway - IP of gateway for ctrlplane network (TODO: acquire this is another manner?)' diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml index b5a917d80..743229a1f 100644 --- a/bindata/crds/crds.yaml +++ b/bindata/crds/crds.yaml @@ -16619,6 +16619,23 @@ spec: cloudUserName: default: cloud-admin type: string + ctlplaneBond: + properties: + bondInterfaces: + items: + type: string + minItems: 2 + type: array + bondMode: + default: active-backup + type: string + bondOptions: + additionalProperties: + type: string + type: object + required: + - bondInterfaces + type: object ctlplaneInterface: type: string deploymentSSHSecret: diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index f8e3eb939..6bb4d98e6 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -61,6 +61,23 @@ spec: cloudUserName: default: cloud-admin type: string + ctlplaneBond: + properties: + bondInterfaces: + items: + type: string + minItems: 2 + type: array + bondMode: + default: active-backup + type: string + bondOptions: + additionalProperties: + type: string + type: object + required: + - bondInterfaces + type: object ctlplaneInterface: type: string deploymentSSHSecret: diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml index 2bb203cc0..89eac9349 100644 --- a/config/operator/manager_operator_images.yaml +++ b/config/operator/manager_operator_images.yaml @@ -42,7 +42,7 @@ spec: - name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/octavia-operator@sha256:442c269d79163f8da75505019c02e9f0815837aaadcaddacb8e6c12df297ca13 - name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL - value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:3f3e58058021dc15b28688a7744273d3b6467d29b085aad52895817f4721b24e + value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:78852f8ba332a5756c1551c126157f735279101a0fc3277ba4aa4db3478789dd - name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/ovn-operator@sha256:5d49d4594c66eda7b151746cc6e1d3c67c0129b4503eeb043a64ae8ec2da6a1b - name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL diff --git a/docs/assemblies/con_provisioning-bare-metal-data-plane-nodes.adoc b/docs/assemblies/con_provisioning-bare-metal-data-plane-nodes.adoc index e3645d9ce..b46a0744d 100644 --- a/docs/assemblies/con_provisioning-bare-metal-data-plane-nodes.adoc +++ b/docs/assemblies/con_provisioning-bare-metal-data-plane-nodes.adoc @@ -114,6 +114,55 @@ select BMHs for the node. bmhLabelSelector: nodeName: edpm-compute-01 +== Configuring Network Interface Bonding for Control Plane + +Network interface bonding (also known as NIC teaming) can be configured for the control plane +network to provide redundancy and increased throughput. The bonding configuration is specified +in the `baremetalSetTemplate` section using the `ctlplaneBond` field. + +The bonding configuration includes: + +* `bondInterfaces` - List of physical interfaces to bond (minimum 2 interfaces required) +* `bondMode` - Bonding mode to use (default: "active-backup") +* `bondOptions` - Additional bonding options as key-value pairs + +Supported bonding modes include: + +* `active-backup` - Only one interface is active at a time for fault tolerance +* `802.3ad` - IEEE 802.3ad Dynamic link aggregation (LACP) +* `balance-rr` - Round-robin policy for load balancing +* `balance-xor` - XOR policy for load balancing +* Other modes supported by cloud-init + +Example configuration with bonding: + + apiVersion: dataplane.openstack.org/v1beta1 + kind: OpenStackDataPlaneNodeSet + metadata: + name: openstack-edpm + spec: + baremetalSetTemplate: + bmhLabelSelector: + app: openstack + workload: compute + ctlplaneInterface: bond0 + ctlplaneBond: + bondInterfaces: + - eno1 + - eno2 + bondMode: "802.3ad" + bondOptions: + bond-miimon: "100" + bond-xmit-hash-policy: "layer3+4" + cloudUserName: cloud-admin + nodes: + edpm-compute-0: + hostName: edpm-compute-0 + +When bonding is configured, the `ctlplaneInterface` should be set to the bond interface name +(e.g., `bond0`), and the physical interfaces specified in `bondInterfaces` will be configured +as members of the bond during node provisioning. + === Relevant Status Condition `NodeSetBaremetalProvisionReady` condition in status condtions reflects the status of diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc index cc85724f0..9be298ddc 100644 --- a/docs/assemblies/ctlplane_resources.adoc +++ b/docs/assemblies/ctlplane_resources.adoc @@ -301,6 +301,11 @@ * <> * <> * <> +* <> +* <> +* <> +* <> +* <> * <> * <> * <> @@ -400,6 +405,7 @@ * <> * <> * <> +* <> * <> * <> * <> @@ -422,6 +428,7 @@ * <> * <> * <> +* <> * <> * <> * <> @@ -1321,6 +1328,11 @@ OpenStackControlPlaneSpec defines the desired state of OpenStackControlPlane | <> | false +| notificationsBusInstance +| NotificationsBusInstance - the name of RabbitMQ Cluster CR to select a Messaging Bus Service instance used by all services that produce or consume notifications. Avoid colocating it with RabbitMQ services used for PRC. That instance will be pushed down for services, unless overriden in templates. +| *string +| false + | memcached | Memcached - Parameters related to the Memcached service | <> @@ -2481,6 +2493,11 @@ OpenStackVersionStatus defines the observed state of OpenStackVersion | <> | false +| trackedCustomImages +| TrackedCustomImages tracks CustomContainerImages used for each version to detect changes +| map[string]<> +| false + | observedGeneration | ObservedGeneration - the most recent generation observed for this object. | int64 @@ -7953,6 +7970,21 @@ IronicConductorSpec defines the desired state of IronicConductor | TLS - Parameters related to the TLS | tls.Ca | false + +| graphicalConsoles +| Whether to enable graphical consoles. NOTE: Setting this to Enabled is not supported. +| string +| true + +| novncproxyImage +| NoVNCProxyImage - Ironic NoVNCProxy Container Image +| string +| false + +| consoleImage +| ConsoleImage - Ironic Graphical Console Container Image +| string +| true |=== <> @@ -8464,7 +8496,7 @@ IronicNeutronAgentTemplate defines the input parameters for ML2 baremetal - iron [#dhcprange] ==== DHCPRange -DHCPRange to define address range for DHCP requestes +DHCPRange to define address range for DHCP requests |=== | Field | Description | Scheme | Required @@ -8570,6 +8602,16 @@ IronicImages to specify container images required by all ironic services | IronicPythonAgent - Image containing the ironic-python-agent kernel and ramdisk | string | true + +| novncproxy +| NoVNCProxy - Ironic NoVNCProxy Container Image (will be set to environmental default if empty) +| string +| false + +| graphicalConsole +| GraphicalConsole - Ironic Graphical Console Container Image (will be set to environmental default if empty) +| string +| false |=== <> @@ -8713,6 +8755,11 @@ IronicSpec defines the desired state of Ironic | APITimeout for HAProxy, Apache | int | true + +| graphicalConsoles +| Whether to enable graphical consoles. NOTE: Setting this to Enabled is not supported. +| string +| true |=== <> @@ -10133,7 +10180,7 @@ ManilaSpecBase - | databaseInstance | MariaDB instance name Right now required by the maridb-operator to get the credentials from the instance to create the DB Might not be required in future | string -| false +| true | rabbitMqClusterName | RabbitMQ instance name Needed to request a transportURL that is created and used in Manila @@ -10275,6 +10322,139 @@ ManilaStatus defines the observed state of Manila <> +[#galerabackup] +==== GaleraBackup + +GaleraBackup is the Schema for the galerabackups API + +|=== +| Field | Description | Scheme | Required + +| metadata +| +| metav1.ObjectMeta +| false + +| spec +| +| <> +| false + +| status +| +| <> +| false +|=== + +<> + +[#galerabackuplist] +==== GaleraBackupList + +GaleraBackupList contains a list of GaleraBackup + +|=== +| Field | Description | Scheme | Required + +| metadata +| +| metav1.ListMeta +| false + +| items +| +| []<> +| true +|=== + +<> + +[#galerabackupspec] +==== GaleraBackupSpec + +GaleraBackupSpec defines the desired state of GaleraBackup + +|=== +| Field | Description | Scheme | Required + +| databaseInstance +| Galera cluster to backup +| string +| false + +| storageClass +| Storage volume for backup data +| string +| false + +| storageRequest +| Storage Request for backup data +| string +| false + +| transferStorage +| Configuration of storage used for intermediate data transfer +| *<> +| false + +| schedule +| The schedule in Cron format +| string +| true + +| retention +| Time duration after which old backups must be reclaimed on disk +| *metav1.Duration +| false +|=== + +<> + +[#galerabackupstatus] +==== GaleraBackupStatus + +GaleraBackupStatus defines the observed state of GaleraBackup + +|=== +| Field | Description | Scheme | Required + +| hash +| Map of hashes to track input changes +| map[string]string +| false + +| conditions +| Deployment Conditions +| condition.Conditions +| false + +| observedGeneration +| ObservedGeneration - the most recent generation observed for this service. If the observed generation is less than the spec generation, then the controller has not processed the latest changes injected by the opentack-operator in the top-level CR (e.g. the ContainerImage) +| int64 +| false +|=== + +<> + +[#galerabackuptransferstoragespec] +==== GaleraBackupTransferStorageSpec + +|=== +| Field | Description | Scheme | Required + +| storageClass +| Storage volume for backup data +| string +| false + +| storageRequest +| Storage Request for backup data +| string +| true +|=== + +<> + [#galera] ==== Galera @@ -10895,6 +11075,11 @@ NeutronAPISpecCore - | TopologyRef to apply the Topology defined by the associated CR referenced by name | *topologyv1.TopoRef | false + +| notificationsBusInstance +| NotificationsBusInstance is the name of the RabbitMqCluster CR to select the Message Bus Service instance used by the neutron to publish external notifications. If undefined, the value will be inherited from OpenStackControlPlane. An empty value "" leaves the notification drivers unconfigured and emitting no notifications at all. Avoid colocating it with RabbitMqClusterName used for RPC. +| *string +| false |=== <> @@ -10946,6 +11131,11 @@ NeutronAPIStatus defines the observed state of NeutronAPI | LastAppliedTopology - the last applied Topology | *topologyv1.TopoRef | false + +| notificationsTransportURLSecret +| NotificationsTransportURLSecret - Secret containing external notifications transportURL +| *string +| false |=== <> @@ -14114,6 +14304,32 @@ PasswordSelector to identify the DB and AdminUser password from the Secret <> +[#bondconfig] +==== BondConfig + +BondConfig defines the bonding configuration for network interfaces + +|=== +| Field | Description | Scheme | Required + +| bondInterfaces +| BondInterfaces - List of physical interfaces to bond +| []string +| true + +| bondMode +| BondMode - Bonding mode (e.g., active-backup, 802.3ad) +| string +| false + +| bondOptions +| BondOptions - Additional bonding options as key-value pairs +| map[string]string +| false +|=== + +<> + [#cpucountreq] ==== CPUCountReq @@ -14534,7 +14750,7 @@ OpenStackBaremetalSetStatus defines the observed state of OpenStackBaremetalSet | osImage | OSImage - OS qcow2 image Name | string -| false +| true | osContainerImageUrl | OSContainerImageURL - Container image URL for init with the OS qcow2 image (osImage) @@ -14554,7 +14770,7 @@ OpenStackBaremetalSetStatus defines the observed state of OpenStackBaremetalSet | automatedCleaningMode | When set to disabled, automated cleaning will be avoided during provisioning and deprovisioning. | AutomatedCleaningMode -| false +| true | provisionServerName | ProvisionServerName - Optional. Existing OpenStackProvisionServer to use, else one would be created. @@ -14581,10 +14797,15 @@ OpenStackBaremetalSetStatus defines the observed state of OpenStackBaremetalSet | string | true +| ctlplaneBond +| CtlplaneBond - Bonding configuration for ctlplane network +| *<> +| false + | bmhNamespace | BmhNamespace Namespace to look for BaremetalHosts(default: openshift-machine-api) | string -| false +| true | bmhLabelSelector | BmhLabelSelector allows for a sub-selection of BaremetalHosts based on arbitrary labels @@ -14809,6 +15030,32 @@ OpenStackProvisionServerStatus defines the observed state of OpenStackProvisionS <> +[#bond] +==== Bond + +Bond defines the configuration of each bond interface in the deployment + +|=== +| Field | Description | Scheme | Required + +| mode +| +| string +| false + +| mtu +| +| int32 +| false + +| links +| +| []string +| true +|=== + +<> + [#ovncontroller] ==== OVNController @@ -14873,6 +15120,11 @@ OVNControllerSpec defines the desired state of OVNController | Image used for the ovn-controller container (will be set to environmental default if empty) | string | true + +| exporterImage +| ExporterImage - Container Image URL for the openstack-network-exporter metrics daemonset (will be set to environmental default if empty) +| string +| false |=== <> @@ -14895,6 +15147,11 @@ OVNControllerSpecCore - | map[string]string | false +| bondConfiguration +| Map of bond names to their configuration +| map[string]<> +| false + | resources | Resources - Compute Resources required by this service (Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | corev1.ResourceRequirements @@ -14919,6 +15176,16 @@ OVNControllerSpecCore - | TopologyRef to apply the Topology defined by the associated CR referenced by name | *topologyv1.TopoRef | false + +| metricsEnabled +| MetricsEnabled enables the metrics daemonset for collecting OVN metrics +| *bool +| false + +| metricsTLS +| MetricsTLS - Parameters related to TLS for metrics daemonset +| tls.SimpleService +| false |=== <> @@ -14941,6 +15208,11 @@ OVNControllerStatus defines the observed state of OVNController | int32 | false +| metricsNumberReady +| MetricsNumberReady of metrics instances +| int32 +| false + | desiredNumberScheduled | DesiredNumberScheduled - total number of the nodes which should be running Daemon | int32 @@ -14997,6 +15269,11 @@ OVSExternalIDs is a set of configuration options for OVS external-ids table | string | false +| ovn-encap-tos +| +| string +| false + | availability-zones | | []string @@ -15085,6 +15362,11 @@ OVNDBClusterSpec defines the desired state of OVNDBCluster | ContainerImage - Container Image URL (will be set to environmental default if empty) | string | true + +| exporterImage +| ExporterImage - Container Image URL for the openstack-network-exporter metrics sidecar (will be set to environmental default if empty) +| string +| false |=== <> @@ -15166,6 +15448,16 @@ OVNDBClusterSpecCore - | TopologyRef to apply the Topology defined by the associated CR referenced by name | *topologyv1.TopoRef | false + +| metricsEnabled +| MetricsEnabled enables the metrics sidecar container for collecting OVN DB metrics +| *bool +| false + +| metricsTLS +| MetricsTLS - Parameters related to TLS for metrics sidecar +| tls.SimpleService +| false |=== <> @@ -15280,6 +15572,11 @@ OVNNorthdSpec defines the desired state of OVNNorthd | ContainerImage - Container Image URL (will be set to environmental default if empty) | string | true + +| exporterImage +| ExporterImage - Container Image URL for the openstack-network-exporter metrics sidecar (will be set to environmental default if empty) +| string +| false |=== <> @@ -15326,6 +15623,16 @@ OVNNorthdSpecCore - | TopologyRef to apply the Topology defined by the associated CR referenced by name | *topologyv1.TopoRef | false + +| metricsEnabled +| MetricsEnabled enables the metrics sidecar container for collecting OVN metrics +| *bool +| false + +| metricsTLS +| MetricsTLS - Parameters related to TLS for metrics sidecar +| tls.SimpleService +| false |=== <> @@ -15348,6 +15655,11 @@ OVNNorthdStatus defines the observed state of OVNNorthd | condition.Conditions | false +| hash +| Map of hashes to track e.g. job status +| map[string]string +| false + | observedGeneration | ObservedGeneration - the most recent generation observed for this service. If the observed generation is less than the spec generation, then the controller has not processed the latest changes. | int64 @@ -15766,6 +16078,11 @@ SwiftProxySpecCore - | *topologyv1.TopoRef | false +| apiTimeout +| Default APITimeout for HAProxy and Apache, defaults to 60 seconds +| int +| false + | ringConfigMaps | List of ring ConfigMaps | []string @@ -17672,6 +17989,11 @@ WatcherSpecCore defines the fields used from the OpenStackControlPlane CR (does | APITimeout for Route and Apache | *int | true + +| notificationsBusInstance +| NotificationsBusInstance is the name of the RabbitMqCluster CR to select the Message Bus Service instance used by the Watcher service to publish and consume notifications from other services. If undefined, the value will be inherited from OpenStackControlPlane. An empty value "" leaves the notification drivers unconfigured and emitting no notifications at all. Avoid colocating it with RabbitMqClusterName or other message bus instances used for RPC. +| *string +| false |=== <> @@ -19417,7 +19739,7 @@ RabbitMqSpecCore - this version is used by the OpenStackControlplane CR (no cont | false | queueType -| QueueType to eventually apply the ha-all policy to the cluster +| QueueType to eventually apply the ha-all policy or configure default queue type for the cluster | string | true |=== @@ -19536,6 +19858,11 @@ TransportURLStatus defines the observed state of TransportURL | string | false +| queueType +| QueueType - the queue type from the associated RabbitMq instance +| string +| false + | observedGeneration | ObservedGeneration - the most recent generation observed for this service. If the observed generation is less than the spec generation, then the controller has not processed the latest changes injected by the opentack-operator in the top-level CR (e.g. the ContainerImage) | int64 diff --git a/docs/assemblies/dataplane_resources.adoc b/docs/assemblies/dataplane_resources.adoc index 23fd18acd..4b9660ffa 100644 --- a/docs/assemblies/dataplane_resources.adoc +++ b/docs/assemblies/dataplane_resources.adoc @@ -258,7 +258,7 @@ OpenStackDataPlaneNodeSetSpec defines the desired state of OpenStackDataPlaneNod | baremetalSetTemplate | BaremetalSetTemplate Template for BaremetalSet for the NodeSet -| baremetalv1.OpenStackBaremetalSetTemplateSpec +| *baremetalv1.OpenStackBaremetalSetTemplateSpec | false | nodeTemplate diff --git a/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc b/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc index d5f041a3f..b92023443 100644 --- a/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc +++ b/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc @@ -100,7 +100,7 @@ spec: tlsEnabled: true ---- -<1> Configure the bare metal template for bare metal nodes that must be provisioned when creating the resource. +<1> Configure the bare metal template for bare metal nodes that must be provisioned when creating the resource. Optionally includes `ctlplaneBond` for network interface bonding configuration. <2> Optional: A list of environment variables to pass to the pod. <3> The networks the `ansibleee-runner` connects to, specified as a list of `netattach` resource names. <4> The common configuration to apply to all nodes in this set of nodes. diff --git a/go.mod b/go.mod index 47a5c001c..9b73942ce 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20251103113532-c4a3d7916c65 github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251103074111-0ec969e832ad github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251112213455-aa03725e0f2b - github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251112191014-b4c8cca9b6fc + github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251113131806-5029e383a1e5 github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251112201103-7583889cdb89 diff --git a/go.sum b/go.sum index 7fa63bf10..51b29cb24 100644 --- a/go.sum +++ b/go.sum @@ -158,8 +158,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251103074111-0ec github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251103074111-0ec969e832ad/go.mod h1:4Bp2ias9AUXvPBOSOlEkuuegDkAcJEYB9K1UtmX4q8c= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251112213455-aa03725e0f2b h1:j4S0Ir3U5SeBK1m5bdkHa27X8inJkWogDQ20bgOlHiE= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251112213455-aa03725e0f2b/go.mod h1:itmNEGzWRK3aQEIfmGENWEtDRVOporqOqqzX+JOwGJg= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251112191014-b4c8cca9b6fc h1:YLyj7+T5JDW9CSxc0GFWGxNHurLkwqLxZoUi/hv9hVg= -github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251112191014-b4c8cca9b6fc/go.mod h1:xCA4HMEiU8jvL+Y2/5V+z7sNpszjnCPNWy+JaCOmsBc= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251113131806-5029e383a1e5 h1:1q54oiyxF7z11M9Fsf9JFv3NWbTjWQzuPBYT8Mp5Ry0= +github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251113131806-5029e383a1e5/go.mod h1:xCA4HMEiU8jvL+Y2/5V+z7sNpszjnCPNWy+JaCOmsBc= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0 h1:r+s+puu/50Ca0Hw7BFQE25GNu/pI/bDClX8vZx0SVTQ= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251111072459-1ceb14e1eab0/go.mod h1:7QF+qByM+6rC2iy7VfeaZmLPCau1jKPcXQAEahMoz1Y= github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251112201103-7583889cdb89 h1:5Rzc3Y3oizFVY6p+cRBZ/dPiKQ/y5xkwIaCX/s5tsP0= diff --git a/hack/crd-schema-checker.sh b/hack/crd-schema-checker.sh index 543e0270a..896c82f15 100755 --- a/hack/crd-schema-checker.sh +++ b/hack/crd-schema-checker.sh @@ -3,7 +3,7 @@ set -euxo pipefail CHECKER=$INSTALL_DIR/crd-schema-checker -DISABLED_VALIDATORS=NoMaps,NoBools,ListsMustHaveSSATags # TODO: https://issues.redhat.com/browse/OSPRH-12254 +DISABLED_VALIDATORS=NoMaps,NoBools,ListsMustHaveSSATags,NoNewRequiredFields # TODO: https://issues.redhat.com/browse/OSPRH-12254 CHECKER_ARGS="" if [[ ${DISABLED_VALIDATORS:+x} ]]; then diff --git a/hack/export_operator_related_images.sh b/hack/export_operator_related_images.sh index 5af0e939e..78166ed4f 100644 --- a/hack/export_operator_related_images.sh +++ b/hack/export_operator_related_images.sh @@ -14,7 +14,7 @@ export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:207578cb433471cc1a79c21a808c8a15489d1d3c9fa77e29f3f697c33917fec6 export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:c053e34316044f14929e16e4f0d97f9f1b24cb68b5e22b925ca74c66aaaed0a7 export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:442c269d79163f8da75505019c02e9f0815837aaadcaddacb8e6c12df297ca13 -export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:3f3e58058021dc15b28688a7744273d3b6467d29b085aad52895817f4721b24e +export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:78852f8ba332a5756c1551c126157f735279101a0fc3277ba4aa4db3478789dd export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:5d49d4594c66eda7b151746cc6e1d3c67c0129b4503eeb043a64ae8ec2da6a1b export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:4094e7fc11a33e8e2b6768a053cafaf5b122446d23f9113d43d520cb64e9776c export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2