add support for maas tag placement (#90)

spectrocloud · Sep 6, 2023 · d9b3dc5 · d9b3dc5
1 parent 18af959
commit d9b3dc5
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 5 deletions.
diff --git a/api/v1alpha3/zz_generated.conversion.go b/api/v1alpha3/zz_generated.conversion.go
diff --git a/api/v1alpha4/groupversion_info.go b/api/v1alpha4/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1alpha4 contains API Schema definitions for the infrastructure v1alpha4 API group
-//+kubebuilder:object:generate=true
-//+groupName=infrastructure.cluster.x-k8s.io
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1alpha4
 
 import (

diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1beta1 contains API Schema definitions for the infrastructure v1beta1 API group
-//+kubebuilder:object:generate=true
-//+groupName=infrastructure.cluster.x-k8s.io
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1beta1
 
 import (

diff --git a/api/v1beta1/maasmachine_types.go b/api/v1beta1/maasmachine_types.go
@@ -56,6 +56,10 @@ type MaasMachineSpec struct {
 	// +kubebuilder:validation:Minimum=0
 	MinMemoryInMB *int `json:"minMemory"`
 
+	// Tags for placement
+	// +optional
+	Tags []string `json:"tags,omitempty"`
+
 	// Image will be the MaaS image id
 	// +kubebuilder:validation:MinLength=1
 	Image string `json:"image"`

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_maasmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_maasmachines.yaml
@@ -363,6 +363,11 @@ spec:
               systemID:
                 description: SystemID will be the MaaS machine ID
                 type: string
+              tags:
+                description: Tags for placement
+                items:
+                  type: string
+                type: array
             required:
             - image
             - minCPU

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_maasmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_maasmachinetemplates.yaml
@@ -211,6 +211,11 @@ spec:
                       systemID:
                         description: SystemID will be the MaaS machine ID
                         type: string
+                      tags:
+                        description: Tags for placement
+                        items:
+                          type: string
+                        type: array
                     required:
                     - image
                     - minCPU

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.17.0
 	github.com/pkg/errors v0.9.1
-	github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20230325022351-83e132faf065
+	github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20230830132549-2f7491722359
 	github.com/spf13/pflag v1.0.5
 	k8s.io/api v0.23.0
 	k8s.io/apiextensions-apiserver v0.23.0

diff --git a/go.sum b/go.sum
@@ -449,6 +449,8 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20230325022351-83e132faf065 h1:9Hp6bTsg2Vpi4EYboy9/pLG3sRpDlePXEVDyvB9FljA=
 github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20230325022351-83e132faf065/go.mod h1:ih7QvZPySD8fiIo56wO+W40w1ojiqNnpLP0Zb6nKvKk=
+github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20230830132549-2f7491722359 h1:Rx+qfNFGE1Oh+cfNB+MW4JGod04jaaJemZ84yAn8HwQ=
+github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20230830132549-2f7491722359/go.mod h1:ih7QvZPySD8fiIo56wO+W40w1ojiqNnpLP0Zb6nKvKk=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=

diff --git a/pkg/maas/client/mock/clienset_mock.go b/pkg/maas/client/mock/clienset_mock.go
diff --git a/pkg/maas/machine/machine.go b/pkg/maas/machine/machine.go
@@ -76,6 +76,10 @@ func (s *Service) DeployMachine(userDataB64 string) (_ *infrav1beta1.Machine, re
 			allocator.WithResourcePool(*mm.Spec.ResourcePool)
 		}
 
+		if len(mm.Spec.Tags) > 0 {
+			allocator.WithTags(mm.Spec.Tags)
+		}
+
 		m, err = allocator.Allocate(ctx)
 		if err != nil {
 			return nil, errors.Wrapf(err, "Unable to allocate machine")

diff --git a/spectro/generated/core-global.yaml b/spectro/generated/core-global.yaml
@@ -830,6 +830,11 @@ spec:
               systemID:
                 description: SystemID will be the MaaS machine ID
                 type: string
+              tags:
+                description: Tags for placement
+                items:
+                  type: string
+                type: array
             required:
             - image
             - minCPU
@@ -1172,6 +1177,11 @@ spec:
                       systemID:
                         description: SystemID will be the MaaS machine ID
                         type: string
+                      tags:
+                        description: Tags for placement
+                        items:
+                          type: string
+                        type: array
                     required:
                     - image
                     - minCPU