Skip to content

Commit 412f930

Browse files
tahsinrahmantahsinrahman
committed
Apply labels to Machines if they're part of a MD or MS
1 parent 6f77ca5 commit 412f930

File tree

8 files changed

+46
-0
lines changed

8 files changed

+46
-0
lines changed

‎api/v1alpha3/machine_types.go

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ const (
3131

3232
// ExcludeNodeDrainingAnnotation annotation explicitly skips node draining if set
3333
ExcludeNodeDrainingAnnotation = "machine.cluster.x-k8s.io.io/exclude-node-draining"
34+
35+
// MachineSetLabelName is the label set on machines if they're controlled by MachineSet
36+
MachineSetLabelName = "cluster.x-k8s.io/set-name"
37+
38+
// MachineDeploymentLabelName is the label set on machines if they're controlled by MachineDeployment
39+
MachineDeploymentLabelName = "cluster.x-k8s.io/deployment-name"
3440
)
3541

3642
// ANCHOR: MachineSpec

‎controllers/machinedeployment_controller.go

+4
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ func (r *MachineDeploymentReconciler) reconcile(ctx context.Context, d *clusterv
143143
}
144144
d.Labels[clusterv1.ClusterLabelName] = d.Spec.ClusterName
145145

146+
// Add MachineDeploymentLabelName label to machines
147+
d.Spec.Selector.MatchLabels[clusterv1.MachineDeploymentLabelName] = d.Name
148+
d.Spec.Template.Labels[clusterv1.MachineDeploymentLabelName] = d.Name
149+
146150
cluster, err := util.GetClusterByName(ctx, r.Client, d.ObjectMeta.Namespace, d.Spec.ClusterName)
147151
if err != nil {
148152
return ctrl.Result{}, err

‎controllers/machinedeployment_controller_test.go

+17
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,23 @@ var _ = Describe("MachineDeployment Reconciler", func() {
147147
return len(machineSets.Items)
148148
}, timeout).Should(BeEquivalentTo(1))
149149

150+
// Verify that expected number of machines are created
151+
By("Verify expected number of machines are created")
152+
machines := &clusterv1.MachineList{}
153+
Eventually(func() int {
154+
if err := k8sClient.List(ctx, machines, client.InNamespace(namespace.Name)); err != nil {
155+
return -1
156+
}
157+
return len(machines.Items)
158+
}, timeout).Should(BeEquivalentTo(*deployment.Spec.Replicas))
159+
160+
// Verify that machines has MachineSetLabelName and MachineDeploymentLabelName labels
161+
By("Verify machines have expected MachineSetLabelName and MachineDeploymentLabelName")
162+
for _, m := range machines.Items {
163+
Expect(m.Labels[clusterv1.MachineDeploymentLabelName]).To(Equal(deployment.Name))
164+
Expect(m.Labels[clusterv1.MachineSetLabelName]).To(Equal(machineSets.Items[0].Name))
165+
}
166+
150167
firstMachineSet := machineSets.Items[0]
151168
Expect(*firstMachineSet.Spec.Replicas).To(BeEquivalentTo(2))
152169
Expect(*firstMachineSet.Spec.Template.Spec.Version).To(BeEquivalentTo("1.10.3"))

‎controllers/machineset_controller.go

+3
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ func (r *MachineSetReconciler) getNewMachine(machineSet *clusterv1.MachineSet) *
384384
machine.ObjectMeta.OwnerReferences = []metav1.OwnerReference{*metav1.NewControllerRef(machineSet, machineSetKind)}
385385
machine.Namespace = machineSet.Namespace
386386
machine.Spec.ClusterName = machineSet.Spec.ClusterName
387+
388+
machine.Labels[clusterv1.MachineSetLabelName] = machineSet.Name
389+
387390
return machine
388391
}
389392

‎controllers/machineset_controller_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ var _ = Describe("MachineSet Reconciler", func() {
141141
return len(machines.Items)
142142
}, timeout).Should(BeEquivalentTo(replicas))
143143

144+
// Verify that machines has MachineSetLabelName label
145+
for _, m := range machines.Items {
146+
Expect(m.Labels[clusterv1.MachineSetLabelName]).To(Equal(instance.Name))
147+
}
148+
144149
// Set the infrastructure reference as ready.
145150
for _, m := range machines.Items {
146151
fakeInfrastructureRefReady(m.Spec.InfrastructureRef, infraResource)

‎go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
2323
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
2424
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
25+
golang.org/x/sys v0.0.0-20191008105621-543471e840be // indirect
2526
golang.org/x/text v0.3.2 // indirect
2627
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
2728
gopkg.in/yaml.v2 v2.2.4 // indirect

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5h
250250
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
251251
golang.org/x/sys v0.0.0-20190312061237-fead79001313 h1:pczuHS43Cp2ktBEEmLwScxgjWsBSzdaQiKzUyf3DTTc=
252252
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
253+
golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
254+
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
253255
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
254256
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
255257
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

‎test/infrastructure/docker/go.sum

+8
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT
4545
github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
4646
github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
4747
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
48+
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
4849
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
4950
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
5051
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -131,6 +132,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
131132
github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
132133
github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
133134
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
135+
github.com/hokaccha/go-prettyjson v0.0.0-20190818114111-108c894c2c0e/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI=
134136
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
135137
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
136138
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -163,6 +165,9 @@ github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN
163165
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
164166
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
165167
github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
168+
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
169+
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
170+
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
166171
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
167172
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
168173
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -246,6 +251,7 @@ github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRci
246251
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
247252
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
248253
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
254+
github.com/the-redback/go-oneliners v0.0.0-20190417084731-74f7694e6dae/go.mod h1:8mAftbjxEoQE8QEeAfSlRixx3wl8aiWKaJLt8ZTIiYE=
249255
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
250256
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
251257
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -298,11 +304,13 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
298304
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
299305
golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
300306
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
307+
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
301308
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
302309
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
303310
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
304311
golang.org/x/sys v0.0.0-20190621203818-d432491b9138 h1:t8BZD9RDjkm9/h7yYN6kE8oaeov5r9aztkB7zKA5Tkg=
305312
golang.org/x/sys v0.0.0-20190621203818-d432491b9138/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
313+
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
306314
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
307315
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
308316
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

0 commit comments

Comments
 (0)