Skip to content

Commit 333da2a

Browse files
committed
refactor noderef code
Signed-off-by: Chuck Ha <[email protected]>
1 parent bae8376 commit 333da2a

File tree

1 file changed

+12
-22
lines changed

1 file changed

+12
-22
lines changed

actuators/machine.go

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,9 @@ func (m *Machine) Create(ctx context.Context, c *clusterv1.Cluster, machine *clu
8989
fmt.Printf("%+v", err)
9090
return err
9191
}
92-
nodeRef := &apicorev1.ObjectReference{
93-
Kind: "Node",
94-
APIVersion: apicorev1.SchemeGroupVersion.String(),
95-
Name: controlPlaneNode.Name(),
96-
UID: types.UID(nodeUID),
97-
}
9892
providerID := providerID(controlPlaneNode.Name())
9993
machine.Spec.ProviderID = &providerID
100-
return m.save(old, machine, nodeRef)
94+
return m.save(old, machine, getNodeRef(controlPlaneNode.Name(), nodeUID))
10195
}
10296

10397
fmt.Println("Creating a brand new cluster")
@@ -121,17 +115,10 @@ func (m *Machine) Create(ctx context.Context, c *clusterv1.Cluster, machine *clu
121115
fmt.Printf("%+v", err)
122116
return err
123117
}
124-
nodeRef := &apicorev1.ObjectReference{
125-
Kind: "Node",
126-
APIVersion: apicorev1.SchemeGroupVersion.String(),
127-
Name: controlPlaneNode.Name(),
128-
UID: types.UID(nodeUID),
129-
}
130-
131118
// set the machine's providerID
132119
providerID := providerID(controlPlaneNode.Name())
133120
machine.Spec.ProviderID = &providerID
134-
if err := m.save(old, machine, nodeRef); err != nil {
121+
if err := m.save(old, machine, getNodeRef(controlPlaneNode.Name(), nodeUID)); err != nil {
135122
fmt.Printf("%+v\n", err)
136123
return err
137124
}
@@ -167,13 +154,7 @@ func (m *Machine) Create(ctx context.Context, c *clusterv1.Cluster, machine *clu
167154
fmt.Printf("%+v", err)
168155
return err
169156
}
170-
nodeRef := &apicorev1.ObjectReference{
171-
Kind: "Node",
172-
APIVersion: apicorev1.SchemeGroupVersion.String(),
173-
Name: worker.Name(),
174-
UID: types.UID(nodeUID),
175-
}
176-
return m.save(old, machine, nodeRef)
157+
return m.save(old, machine, getNodeRef(worker.Name(), nodeUID))
177158
}
178159

179160
// Delete returns nil when the machine no longer exists or when a successful delete has happened.
@@ -262,3 +243,12 @@ func CAPIroleToKindRole(CAPIRole string) string {
262243
}
263244
return CAPIRole
264245
}
246+
247+
func getNodeRef(name, uid string) *apicorev1.ObjectReference {
248+
return &apicorev1.ObjectReference{
249+
Kind: "Node",
250+
APIVersion: apicorev1.SchemeGroupVersion.String(),
251+
Name: name,
252+
UID: types.UID(uid),
253+
}
254+
}

0 commit comments

Comments
 (0)