@@ -89,15 +89,9 @@ func (m *Machine) Create(ctx context.Context, c *clusterv1.Cluster, machine *clu
89
89
fmt .Printf ("%+v" , err )
90
90
return err
91
91
}
92
- nodeRef := & apicorev1.ObjectReference {
93
- Kind : "Node" ,
94
- APIVersion : apicorev1 .SchemeGroupVersion .String (),
95
- Name : controlPlaneNode .Name (),
96
- UID : types .UID (nodeUID ),
97
- }
98
92
providerID := providerID (controlPlaneNode .Name ())
99
93
machine .Spec .ProviderID = & providerID
100
- return m .save (old , machine , nodeRef )
94
+ return m .save (old , machine , getNodeRef ( controlPlaneNode . Name (), nodeUID ) )
101
95
}
102
96
103
97
fmt .Println ("Creating a brand new cluster" )
@@ -121,17 +115,10 @@ func (m *Machine) Create(ctx context.Context, c *clusterv1.Cluster, machine *clu
121
115
fmt .Printf ("%+v" , err )
122
116
return err
123
117
}
124
- nodeRef := & apicorev1.ObjectReference {
125
- Kind : "Node" ,
126
- APIVersion : apicorev1 .SchemeGroupVersion .String (),
127
- Name : controlPlaneNode .Name (),
128
- UID : types .UID (nodeUID ),
129
- }
130
-
131
118
// set the machine's providerID
132
119
providerID := providerID (controlPlaneNode .Name ())
133
120
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 {
135
122
fmt .Printf ("%+v\n " , err )
136
123
return err
137
124
}
@@ -167,13 +154,7 @@ func (m *Machine) Create(ctx context.Context, c *clusterv1.Cluster, machine *clu
167
154
fmt .Printf ("%+v" , err )
168
155
return err
169
156
}
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 ))
177
158
}
178
159
179
160
// 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 {
262
243
}
263
244
return CAPIRole
264
245
}
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