Merge branch 'main' into cloudkitty

Author: jlarriba

Dockerfile

@@ -1,4 +1,6 @@
-ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24
+# TODO(amoralej) go-toolset image pinned until a fix is provided for
+# https://issues.redhat.com/browse/RHEL-128838
+ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24.6-1762230058
 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.6
 # Build the manager binary
 FROM $GOLANG_BUILDER AS builder

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:

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

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=

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?)'

bindata/crds/crds.yaml

@@ -17076,6 +17076,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:

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:

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

config/samples/dataplane/swift/kustomization.yaml

@@ -14,7 +14,7 @@ replacements:
 - source:
     kind: DataPlaneConfig
     name: edpm-swift-values
-    fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_swift_disks
+    fieldPath: data.nodeset.nodeTemplate.ansible.ansibleVars.edpm_swift_disks
   targets:
   - select:
       kind: OpenStackDataPlaneNodeSet
@@ -36,7 +36,7 @@ replacements:
 - source:
     kind: DataPlaneConfig
     name: edpm-swift-values
-    fieldPath: data.nodeset.networkattachments
+    fieldPath: data.nodeset.networkAttachments
   targets:
   - select:
       kind: OpenStackDataPlaneNodeSet

config/samples/dataplane/swift/values.yaml

@@ -7,12 +7,12 @@ metadata:
     config.kubernetes.io/local-config: "true"
 data:
   nodeset:
-    networkattachments:
+    networkAttachments:
     - ctlplane
     - storage
-    nodetemplate:
+    nodeTemplate:
       ansible:
-        vars:
+        ansibleVars:
           # Swift disks defined here apply to all nodes. Node-specific disks
           # might be defined in the nodes: section below
           #
@@ -22,11 +22,11 @@ data:
           # zone are optional and might be used to enforce distribution of
           # replicas
           edpm_swift_disks:
-            - device: /dev/vdb
-              path: /srv/node/vdb
-              weight: 4000
-              region: 0
-              zone: 0
+          - device: /dev/vdb
+            path: /srv/node/vdb
+            weight: 4000
+            region: 0
+            zone: 0
     nodes:
       edpm-swift-0:
         ansible:
@@ -36,9 +36,9 @@ data:
             # node with a different disk. This node will use only vdc. It would
             # use vdb from parent section if not defined
             edpm_swift_disks:
-              - device: /dev/vdc
-                path: /srv/node/vdc
-                weight: 1000
+            - device: /dev/vdc
+              path: /srv/node/vdc
+              weight: 1000
         hostName: edpm-swift-0
         networks:
         - defaultRoute: true