Allow override CtlplaneInterface in nodeset node

Allow overriding the CtlplaneInterface in the nodeset Nodes,
this will allow nodesets where one or more nodes use different
interfaces for the ctlplane interface.

Author: hjensas

apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

@@ -813,6 +813,8 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
+                    ctlplaneInterface:
+                      type: string
                     hostName:
                       type: string
                     managementNetwork:

apis/dataplane/v1beta1/common.go

@@ -130,6 +130,10 @@ type NodeSection struct {
 	// ManagementNetwork - Name of network to use for management (SSH/Ansible)
 	// +kubebuilder:validation:Optional
 	ManagementNetwork string `json:"managementNetwork,omitempty"`
+
+	// CtlplaneInterface - Interface on the provisioned nodes to use for ctlplane network
+	// +kubebuilder:validation:Optional
+	CtlplaneInterface string `json:"ctlplaneInterface,omitempty"`
 }
 
 // NodeTemplate is a specification of the node attributes that override top level attributes.

apis/go.mod

@@ -85,7 +85,7 @@ require (
 	github.com/prometheus/procfs v0.13.0 // indirect
 	github.com/rabbitmq/cluster-operator/v2 v2.11.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.18.0 // indirect

apis/go.sum

@@ -161,8 +161,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

bindata/crds/crds.yaml

@@ -18816,6 +18816,8 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
+                    ctlplaneInterface:
+                      type: string
                     hostName:
                       type: string
                     managementNetwork:

config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

@@ -813,6 +813,8 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
+                    ctlplaneInterface:
+                      type: string
                     hostName:
                       type: string
                     managementNetwork:

go.mod

@@ -91,7 +91,7 @@ require (
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
 	github.com/rhobs/observability-operator v0.3.1 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/mod v0.20.0 // indirect

go.sum

@@ -173,8 +173,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

pkg/dataplane/baremetal.go

@@ -83,6 +83,7 @@ func DeployBaremetalSet(
 			instanceSpec.BmhLabelSelector = node.BmhLabelSelector
 			instanceSpec.UserData = node.UserData
 			instanceSpec.NetworkData = node.NetworkData
+			instanceSpec.CtlplaneInterface = node.CtlplaneInterface
 			for _, res := range ipSet.Status.Reservation {
 				if strings.ToLower(string(res.Network)) == dataplanev1.CtlPlaneNetwork {
 					_, ipNet, err := net.ParseCIDR(res.Cidr)