Skip to content

Commit 838dcbb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8244 from killianmuldoon/pr-rename-md
🌱 Rename md parameters for consistency
2 parents 1c15a20 + 69ce798 commit 838dcbb

File tree

8 files changed

+109
-109
lines changed

8 files changed

+109
-109
lines changed

‎cmd/clusterctl/client/alpha/machinedeployment.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ func findMachineDeploymentRevision(toRevision int64, allMSs []*clusterv1.Machine
118118
}
119119

120120
// getMachineSetsForDeployment returns a list of MachineSets associated with a MachineDeployment.
121-
func getMachineSetsForDeployment(proxy cluster.Proxy, d *clusterv1.MachineDeployment) ([]*clusterv1.MachineSet, error) {
121+
func getMachineSetsForDeployment(proxy cluster.Proxy, md *clusterv1.MachineDeployment) ([]*clusterv1.MachineSet, error) {
122122
log := logf.Log
123123
c, err := proxy.NewClient()
124124
if err != nil {
125125
return nil, err
126126
}
127127
// List all MachineSets to find those we own but that no longer match our selector.
128128
machineSets := &clusterv1.MachineSetList{}
129-
if err := c.List(ctx, machineSets, client.InNamespace(d.Namespace)); err != nil {
129+
if err := c.List(ctx, machineSets, client.InNamespace(md.Namespace)); err != nil {
130130
return nil, err
131131
}
132132

@@ -135,12 +135,12 @@ func getMachineSetsForDeployment(proxy cluster.Proxy, d *clusterv1.MachineDeploy
135135
ms := &machineSets.Items[idx]
136136

137137
// Skip this MachineSet if its controller ref is not pointing to this MachineDeployment
138-
if !metav1.IsControlledBy(ms, d) {
138+
if !metav1.IsControlledBy(ms, md) {
139139
log.V(5).Info("Skipping MachineSet, controller ref does not match MachineDeployment", "machineset", ms.Name)
140140
continue
141141
}
142142

143-
selector, err := metav1.LabelSelectorAsSelector(&d.Spec.Selector)
143+
selector, err := metav1.LabelSelectorAsSelector(&md.Spec.Selector)
144144
if err != nil {
145145
log.V(5).Info("Skipping MachineSet, failed to get label selector from spec selector", "machineset", ms.Name)
146146
continue

‎cmd/clusterctl/client/alpha/rollout_rollbacker.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (r *rollout) ObjectRollbacker(proxy cluster.Proxy, ref corev1.ObjectReferen
4747
}
4848

4949
// rollbackMachineDeployment will rollback to a previous MachineSet revision used by this MachineDeployment.
50-
func rollbackMachineDeployment(proxy cluster.Proxy, d *clusterv1.MachineDeployment, toRevision int64) error {
50+
func rollbackMachineDeployment(proxy cluster.Proxy, md *clusterv1.MachineDeployment, toRevision int64) error {
5151
log := logf.Log
5252
c, err := proxy.NewClient()
5353
if err != nil {
@@ -57,7 +57,7 @@ func rollbackMachineDeployment(proxy cluster.Proxy, d *clusterv1.MachineDeployme
5757
if toRevision < 0 {
5858
return errors.Errorf("revision number cannot be negative: %v", toRevision)
5959
}
60-
msList, err := getMachineSetsForDeployment(proxy, d)
60+
msList, err := getMachineSetsForDeployment(proxy, md)
6161
if err != nil {
6262
return err
6363
}
@@ -67,14 +67,14 @@ func rollbackMachineDeployment(proxy cluster.Proxy, d *clusterv1.MachineDeployme
6767
return err
6868
}
6969
log.V(7).Info("Found revision", "revision", msForRevision)
70-
patchHelper, err := patch.NewHelper(d, c)
70+
patchHelper, err := patch.NewHelper(md, c)
7171
if err != nil {
7272
return err
7373
}
7474
// Copy template into the machinedeployment (excluding the hash)
7575
revMSTemplate := *msForRevision.Spec.Template.DeepCopy()
7676
delete(revMSTemplate.Labels, clusterv1.MachineDeploymentUniqueLabel)
7777

78-
d.Spec.Template = revMSTemplate
79-
return patchHelper.Patch(ctx, d)
78+
md.Spec.Template = revMSTemplate
79+
return patchHelper.Patch(ctx, md)
8080
}

‎internal/controllers/machinedeployment/machinedeployment_controller.go

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
172172
return result, err
173173
}
174174

175-
func patchMachineDeployment(ctx context.Context, patchHelper *patch.Helper, d *clusterv1.MachineDeployment, options ...patch.Option) error {
175+
func patchMachineDeployment(ctx context.Context, patchHelper *patch.Helper, md *clusterv1.MachineDeployment, options ...patch.Option) error {
176176
// Always update the readyCondition by summarizing the state of other conditions.
177-
conditions.SetSummary(d,
177+
conditions.SetSummary(md,
178178
conditions.WithConditions(
179179
clusterv1.MachineDeploymentAvailableCondition,
180180
),
@@ -187,29 +187,29 @@ func patchMachineDeployment(ctx context.Context, patchHelper *patch.Helper, d *c
187187
clusterv1.MachineDeploymentAvailableCondition,
188188
}},
189189
)
190-
return patchHelper.Patch(ctx, d, options...)
190+
return patchHelper.Patch(ctx, md, options...)
191191
}
192192

193-
func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster, d *clusterv1.MachineDeployment) (ctrl.Result, error) {
193+
func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster, md *clusterv1.MachineDeployment) (ctrl.Result, error) {
194194
log := ctrl.LoggerFrom(ctx)
195195
log.V(4).Info("Reconcile MachineDeployment")
196196

197197
// Reconcile and retrieve the Cluster object.
198-
if d.Labels == nil {
199-
d.Labels = make(map[string]string)
198+
if md.Labels == nil {
199+
md.Labels = make(map[string]string)
200200
}
201-
if d.Spec.Selector.MatchLabels == nil {
202-
d.Spec.Selector.MatchLabels = make(map[string]string)
201+
if md.Spec.Selector.MatchLabels == nil {
202+
md.Spec.Selector.MatchLabels = make(map[string]string)
203203
}
204-
if d.Spec.Template.Labels == nil {
205-
d.Spec.Template.Labels = make(map[string]string)
204+
if md.Spec.Template.Labels == nil {
205+
md.Spec.Template.Labels = make(map[string]string)
206206
}
207207

208-
d.Labels[clusterv1.ClusterNameLabel] = d.Spec.ClusterName
208+
md.Labels[clusterv1.ClusterNameLabel] = md.Spec.ClusterName
209209

210210
// Set the MachineDeployment as directly owned by the Cluster (if not already present).
211-
if r.shouldAdopt(d) {
212-
d.OwnerReferences = util.EnsureOwnerRef(d.OwnerReferences, metav1.OwnerReference{
211+
if r.shouldAdopt(md) {
212+
md.OwnerReferences = util.EnsureOwnerRef(md.OwnerReferences, metav1.OwnerReference{
213213
APIVersion: clusterv1.GroupVersion.String(),
214214
Kind: "Cluster",
215215
Name: cluster.Name,
@@ -219,17 +219,17 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
219219
}
220220

221221
// Make sure to reconcile the external infrastructure reference.
222-
if err := reconcileExternalTemplateReference(ctx, r.Client, cluster, &d.Spec.Template.Spec.InfrastructureRef); err != nil {
222+
if err := reconcileExternalTemplateReference(ctx, r.Client, cluster, &md.Spec.Template.Spec.InfrastructureRef); err != nil {
223223
return ctrl.Result{}, err
224224
}
225225
// Make sure to reconcile the external bootstrap reference, if any.
226-
if d.Spec.Template.Spec.Bootstrap.ConfigRef != nil {
227-
if err := reconcileExternalTemplateReference(ctx, r.Client, cluster, d.Spec.Template.Spec.Bootstrap.ConfigRef); err != nil {
226+
if md.Spec.Template.Spec.Bootstrap.ConfigRef != nil {
227+
if err := reconcileExternalTemplateReference(ctx, r.Client, cluster, md.Spec.Template.Spec.Bootstrap.ConfigRef); err != nil {
228228
return ctrl.Result{}, err
229229
}
230230
}
231231

232-
msList, err := r.getMachineSetsForDeployment(ctx, d)
232+
msList, err := r.getMachineSetsForDeployment(ctx, md)
233233
if err != nil {
234234
return ctrl.Result{}, err
235235
}
@@ -241,15 +241,15 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
241241
// to all MachineSets created by a MachineDeployment or if a user manually removed the label.
242242
for idx := range msList {
243243
machineSet := msList[idx]
244-
if name, ok := machineSet.Labels[clusterv1.MachineDeploymentNameLabel]; ok && name == d.Name {
244+
if name, ok := machineSet.Labels[clusterv1.MachineDeploymentNameLabel]; ok && name == md.Name {
245245
continue
246246
}
247247

248248
helper, err := patch.NewHelper(machineSet, r.Client)
249249
if err != nil {
250250
return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to MachineSet %q", clusterv1.MachineDeploymentNameLabel, machineSet.Name)
251251
}
252-
machineSet.Labels[clusterv1.MachineDeploymentNameLabel] = d.Name
252+
machineSet.Labels[clusterv1.MachineDeploymentNameLabel] = md.Name
253253
if err := helper.Patch(ctx, machineSet); err != nil {
254254
return ctrl.Result{}, errors.Wrapf(err, "failed to apply %s label to MachineSet %q", clusterv1.MachineDeploymentNameLabel, machineSet.Name)
255255
}
@@ -268,43 +268,43 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
268268
}
269269
}
270270

271-
if d.Spec.Paused {
272-
return ctrl.Result{}, r.sync(ctx, d, msList)
271+
if md.Spec.Paused {
272+
return ctrl.Result{}, r.sync(ctx, md, msList)
273273
}
274274

275-
if d.Spec.Strategy == nil {
275+
if md.Spec.Strategy == nil {
276276
return ctrl.Result{}, errors.Errorf("missing MachineDeployment strategy")
277277
}
278278

279-
if d.Spec.Strategy.Type == clusterv1.RollingUpdateMachineDeploymentStrategyType {
280-
if d.Spec.Strategy.RollingUpdate == nil {
281-
return ctrl.Result{}, errors.Errorf("missing MachineDeployment settings for strategy type: %s", d.Spec.Strategy.Type)
279+
if md.Spec.Strategy.Type == clusterv1.RollingUpdateMachineDeploymentStrategyType {
280+
if md.Spec.Strategy.RollingUpdate == nil {
281+
return ctrl.Result{}, errors.Errorf("missing MachineDeployment settings for strategy type: %s", md.Spec.Strategy.Type)
282282
}
283-
return ctrl.Result{}, r.rolloutRolling(ctx, d, msList)
283+
return ctrl.Result{}, r.rolloutRolling(ctx, md, msList)
284284
}
285285

286-
if d.Spec.Strategy.Type == clusterv1.OnDeleteMachineDeploymentStrategyType {
287-
return ctrl.Result{}, r.rolloutOnDelete(ctx, d, msList)
286+
if md.Spec.Strategy.Type == clusterv1.OnDeleteMachineDeploymentStrategyType {
287+
return ctrl.Result{}, r.rolloutOnDelete(ctx, md, msList)
288288
}
289289

290-
return ctrl.Result{}, errors.Errorf("unexpected deployment strategy type: %s", d.Spec.Strategy.Type)
290+
return ctrl.Result{}, errors.Errorf("unexpected deployment strategy type: %s", md.Spec.Strategy.Type)
291291
}
292292

293293
// getMachineSetsForDeployment returns a list of MachineSets associated with a MachineDeployment.
294-
func (r *Reconciler) getMachineSetsForDeployment(ctx context.Context, d *clusterv1.MachineDeployment) ([]*clusterv1.MachineSet, error) {
294+
func (r *Reconciler) getMachineSetsForDeployment(ctx context.Context, md *clusterv1.MachineDeployment) ([]*clusterv1.MachineSet, error) {
295295
log := ctrl.LoggerFrom(ctx)
296296

297297
// List all MachineSets to find those we own but that no longer match our selector.
298298
machineSets := &clusterv1.MachineSetList{}
299-
if err := r.Client.List(ctx, machineSets, client.InNamespace(d.Namespace)); err != nil {
299+
if err := r.Client.List(ctx, machineSets, client.InNamespace(md.Namespace)); err != nil {
300300
return nil, err
301301
}
302302

303303
filtered := make([]*clusterv1.MachineSet, 0, len(machineSets.Items))
304304
for idx := range machineSets.Items {
305305
ms := &machineSets.Items[idx]
306306
log.WithValues("MachineSet", klog.KObj(ms))
307-
selector, err := metav1.LabelSelectorAsSelector(&d.Spec.Selector)
307+
selector, err := metav1.LabelSelectorAsSelector(&md.Spec.Selector)
308308
if err != nil {
309309
log.Error(err, "Skipping MachineSet, failed to get label selector from spec selector")
310310
continue
@@ -317,23 +317,23 @@ func (r *Reconciler) getMachineSetsForDeployment(ctx context.Context, d *cluster
317317
}
318318

319319
// Skip this MachineSet unless either selector matches or it has a controller ref pointing to this MachineDeployment
320-
if !selector.Matches(labels.Set(ms.Labels)) && !metav1.IsControlledBy(ms, d) {
320+
if !selector.Matches(labels.Set(ms.Labels)) && !metav1.IsControlledBy(ms, md) {
321321
log.V(4).Info("Skipping MachineSet, label mismatch")
322322
continue
323323
}
324324

325325
// Attempt to adopt MachineSet if it meets previous conditions and it has no controller references.
326326
if metav1.GetControllerOf(ms) == nil {
327-
if err := r.adoptOrphan(ctx, d, ms); err != nil {
327+
if err := r.adoptOrphan(ctx, md, ms); err != nil {
328328
log.Error(err, "Failed to adopt MachineSet into MachineDeployment")
329-
r.recorder.Eventf(d, corev1.EventTypeWarning, "FailedAdopt", "Failed to adopt MachineSet %q: %v", ms.Name, err)
329+
r.recorder.Eventf(md, corev1.EventTypeWarning, "FailedAdopt", "Failed to adopt MachineSet %q: %v", ms.Name, err)
330330
continue
331331
}
332332
log.Info("Adopted MachineSet into MachineDeployment")
333-
r.recorder.Eventf(d, corev1.EventTypeNormal, "SuccessfulAdopt", "Adopted MachineSet %q", ms.Name)
333+
r.recorder.Eventf(md, corev1.EventTypeNormal, "SuccessfulAdopt", "Adopted MachineSet %q", ms.Name)
334334
}
335335

336-
if !metav1.IsControlledBy(ms, d) {
336+
if !metav1.IsControlledBy(ms, md) {
337337
continue
338338
}
339339

‎internal/controllers/machinedeployment/machinedeployment_rolling.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
)
3131

3232
// rolloutRolling implements the logic for rolling a new MachineSet.
33-
func (r *Reconciler) rolloutRolling(ctx context.Context, d *clusterv1.MachineDeployment, msList []*clusterv1.MachineSet) error {
34-
newMS, oldMSs, err := r.getAllMachineSetsAndSyncRevision(ctx, d, msList, true)
33+
func (r *Reconciler) rolloutRolling(ctx context.Context, md *clusterv1.MachineDeployment, msList []*clusterv1.MachineSet) error {
34+
newMS, oldMSs, err := r.getAllMachineSetsAndSyncRevision(ctx, md, msList, true)
3535
if err != nil {
3636
return err
3737
}
@@ -46,25 +46,25 @@ func (r *Reconciler) rolloutRolling(ctx context.Context, d *clusterv1.MachineDep
4646
allMSs := append(oldMSs, newMS)
4747

4848
// Scale up, if we can.
49-
if err := r.reconcileNewMachineSet(ctx, allMSs, newMS, d); err != nil {
49+
if err := r.reconcileNewMachineSet(ctx, allMSs, newMS, md); err != nil {
5050
return err
5151
}
5252

53-
if err := r.syncDeploymentStatus(allMSs, newMS, d); err != nil {
53+
if err := r.syncDeploymentStatus(allMSs, newMS, md); err != nil {
5454
return err
5555
}
5656

5757
// Scale down, if we can.
58-
if err := r.reconcileOldMachineSets(ctx, allMSs, oldMSs, newMS, d); err != nil {
58+
if err := r.reconcileOldMachineSets(ctx, allMSs, oldMSs, newMS, md); err != nil {
5959
return err
6060
}
6161

62-
if err := r.syncDeploymentStatus(allMSs, newMS, d); err != nil {
62+
if err := r.syncDeploymentStatus(allMSs, newMS, md); err != nil {
6363
return err
6464
}
6565

66-
if mdutil.DeploymentComplete(d, &d.Status) {
67-
if err := r.cleanupDeployment(ctx, oldMSs, d); err != nil {
66+
if mdutil.DeploymentComplete(md, &md.Status) {
67+
if err := r.cleanupDeployment(ctx, oldMSs, md); err != nil {
6868
return err
6969
}
7070
}

‎internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
)
3333

3434
// rolloutOnDelete implements the logic for the OnDelete MachineDeploymentStrategyType.
35-
func (r *Reconciler) rolloutOnDelete(ctx context.Context, d *clusterv1.MachineDeployment, msList []*clusterv1.MachineSet) error {
36-
newMS, oldMSs, err := r.getAllMachineSetsAndSyncRevision(ctx, d, msList, true)
35+
func (r *Reconciler) rolloutOnDelete(ctx context.Context, md *clusterv1.MachineDeployment, msList []*clusterv1.MachineSet) error {
36+
newMS, oldMSs, err := r.getAllMachineSetsAndSyncRevision(ctx, md, msList, true)
3737
if err != nil {
3838
return err
3939
}
@@ -48,25 +48,25 @@ func (r *Reconciler) rolloutOnDelete(ctx context.Context, d *clusterv1.MachineDe
4848
allMSs := append(oldMSs, newMS)
4949

5050
// Scale up, if we can.
51-
if err := r.reconcileNewMachineSetOnDelete(ctx, allMSs, newMS, d); err != nil {
51+
if err := r.reconcileNewMachineSetOnDelete(ctx, allMSs, newMS, md); err != nil {
5252
return err
5353
}
5454

55-
if err := r.syncDeploymentStatus(allMSs, newMS, d); err != nil {
55+
if err := r.syncDeploymentStatus(allMSs, newMS, md); err != nil {
5656
return err
5757
}
5858

5959
// Scale down, if we can.
60-
if err := r.reconcileOldMachineSetsOnDelete(ctx, oldMSs, allMSs, d); err != nil {
60+
if err := r.reconcileOldMachineSetsOnDelete(ctx, oldMSs, allMSs, md); err != nil {
6161
return err
6262
}
6363

64-
if err := r.syncDeploymentStatus(allMSs, newMS, d); err != nil {
64+
if err := r.syncDeploymentStatus(allMSs, newMS, md); err != nil {
6565
return err
6666
}
6767

68-
if mdutil.DeploymentComplete(d, &d.Status) {
69-
if err := r.cleanupDeployment(ctx, oldMSs, d); err != nil {
68+
if mdutil.DeploymentComplete(md, &md.Status) {
69+
if err := r.cleanupDeployment(ctx, oldMSs, md); err != nil {
7070
return err
7171
}
7272
}

0 commit comments

Comments
 (0)