Merge pull request kubernetes-sigs#54 from kahun/feature/EOS_11009_ad…

…d_labels_to_node_groups [EOS-11009] Add labels to node groups
stg-0 · Mar 14, 2023 · 251490d · 251490d
2 parents c0d447f + 524b3a8
commit 251490d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/pkg/cluster/internal/create/actions/cluster/cluster.go b/pkg/cluster/internal/create/actions/cluster/cluster.go
@@ -102,17 +102,18 @@ type AWS struct {
 }
 
 type WorkerNodes []struct {
-	Name             string `yaml:"name" validate:"required"`
-	AmiID            string `yaml:"ami_id"`
-	Quantity         int    `yaml:"quantity" validate:"required,numeric,gt=0"`
-	Size             string `yaml:"size" validate:"required"`
-	Image            string `yaml:"image" validate:"required_if=InfraProvider gcp"`
-	ZoneDistribution string `yaml:"zone_distribution" validate:"omitempty,oneof='balanced' 'unbalanced'"`
-	AZ               string `yaml:"az"`
-	SSHKey           string `yaml:"ssh_key"`
-	Spot             bool   `yaml:"spot" validate:"omitempty,boolean"`
-	NodeGroupMaxSize int    `yaml:"max_size" validate:"omitempty,numeric,required_with=NodeGroupMinSize,gtefield=Quantity,gt=0"`
-	NodeGroupMinSize int    `yaml:"min_size" validate:"omitempty,numeric,required_with=NodeGroupMaxSize,ltefield=Quantity,gt=0"`
+	Name             string            `yaml:"name" validate:"required"`
+	AmiID            string            `yaml:"ami_id"`
+	Quantity         int               `yaml:"quantity" validate:"required,numeric,gt=0"`
+	Size             string            `yaml:"size" validate:"required"`
+	Image            string            `yaml:"image" validate:"required_if=InfraProvider gcp"`
+	ZoneDistribution string            `yaml:"zone_distribution" validate:"omitempty,oneof='balanced' 'unbalanced'"`
+	AZ               string            `yaml:"az"`
+	SSHKey           string            `yaml:"ssh_key"`
+	Spot             bool              `yaml:"spot" validate:"omitempty,boolean"`
+	Labels           map[string]string `yaml:"labels"`
+	NodeGroupMaxSize int               `yaml:"max_size" validate:"omitempty,numeric,required_with=NodeGroupMinSize,gtefield=Quantity,gt=0"`
+	NodeGroupMinSize int               `yaml:"min_size" validate:"omitempty,numeric,required_with=NodeGroupMaxSize,ltefield=Quantity,gt=0"`
 	RootVolume       struct {
 		Size      int    `yaml:"size" validate:"numeric"`
 		Type      string `yaml:"type"`

diff --git a/pkg/cluster/internal/create/actions/cluster/templates/aws.eks.tmpl b/pkg/cluster/internal/create/actions/cluster/templates/aws.eks.tmpl
@@ -131,6 +131,10 @@ metadata:
   name: "{{ $node.Name }}-md-{{ $index }}"
   namespace: "cluster-{{ $.Descriptor.ClusterID }}"
 spec:
-  template: {}
+  template: {{ if not $node.Labels }}{}{{- else }}
+    spec:
+      kubeletExtraArgs:
+        node-labels: \"{{ range $key, $value := $node.Labels }}{{ $key }}={{ $value }},{{- end }}\"
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/pkg/cluster/internal/create/actions/cluster/templates/gcp.tmpl b/pkg/cluster/internal/create/actions/cluster/templates/gcp.tmpl
@@ -206,5 +206,6 @@ spec:
           name: {{`'{{ ds.meta_data.local_hostname.split(\".\")[0] }}'`}}
           kubeletExtraArgs:
             cloud-provider: gce
+            node-labels: \"{{ if $node.Labels }}{{ range $key, $value := $node.Labels }}{{ $key }}={{ $value }},{{- end }}{{- end }}\"
 {{- end }}
 {{- end }}