diff --git a/pkg/api/v1/vino_types.go b/pkg/api/v1/vino_types.go index d0246bf..2b76e33 100644 --- a/pkg/api/v1/vino_types.go +++ b/pkg/api/v1/vino_types.go @@ -95,7 +95,7 @@ type NodeSet struct { //Parameter for Node master or worker-standard Name string `json:"name,omitempty"` Count int `json:"count,omitempty"` - NodeLabel *VMNodeFlavor `json:"labels,omitempty"` + NodeLabel VMNodeFlavor `json:"labels,omitempty"` LibvirtTemplate NamespacedName `json:"libvirtTemplate,omitempty"` NetworkInterface *NetworkInterface `json:"networkInterfaces,omitempty"` DiskDrives *DiskDrivesTemplate `json:"diskDrives,omitempty"` diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go index a2bd3a5..b3aef28 100644 --- a/pkg/api/v1/zz_generated.deepcopy.go +++ b/pkg/api/v1/zz_generated.deepcopy.go @@ -292,11 +292,7 @@ func (in *NodeSelector) DeepCopy() *NodeSelector { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeSet) DeepCopyInto(out *NodeSet) { *out = *in - if in.NodeLabel != nil { - in, out := &in.NodeLabel, &out.NodeLabel - *out = new(VMNodeFlavor) - (*in).DeepCopyInto(*out) - } + in.NodeLabel.DeepCopyInto(&out.NodeLabel) out.LibvirtTemplate = in.LibvirtTemplate if in.NetworkInterface != nil { in, out := &in.NetworkInterface, &out.NetworkInterface diff --git a/pkg/controllers/bmh.go b/pkg/controllers/bmh.go index 4f215f9..594642e 100644 --- a/pkg/controllers/bmh.go +++ b/pkg/controllers/bmh.go @@ -120,6 +120,7 @@ func (r *VinoReconciler) createBMHperPod(ctx context.Context, vino *vinov1.Vino, return err } + // TODO extend this function to return server/rack labels as well bmcAddr, err := r.getBMCAddress(ctx, pod, roleSuffix) if err != nil { return err @@ -129,6 +130,9 @@ func (r *VinoReconciler) createBMHperPod(ctx context.Context, vino *vinov1.Vino, ObjectMeta: metav1.ObjectMeta{ Name: bmhName, Namespace: getRuntimeNamespace(), + // TODO add rack and server labels, when we crearly define mechanism + // which labels we are copying + Labels: node.NodeLabel.VMFlavor, }, Spec: metal3.BareMetalHostSpec{ NetworkData: &corev1.SecretReference{