Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 MD controller: fix nil pointer when OnDelete policy is used #8184

Merged
merged 1 commit into from
Feb 27, 2023
Merged

🐛 MD controller: fix nil pointer when OnDelete policy is used #8184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion internal/controllers/machinedeployment/machinedeployment_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,11 @@ func (r *Reconciler) computeDesiredMachineSet(deployment *clusterv1.MachineDeplo

// Set all other in-place mutable fields.
desiredMS.Spec.MinReadySeconds = pointer.Int32Deref(deployment.Spec.MinReadySeconds, 0)
desiredMS.Spec.DeletePolicy = pointer.StringDeref(deployment.Spec.Strategy.RollingUpdate.DeletePolicy, "")
if deployment.Spec.Strategy != nil && deployment.Spec.Strategy.RollingUpdate != nil {
desiredMS.Spec.DeletePolicy = pointer.StringDeref(deployment.Spec.Strategy.RollingUpdate.DeletePolicy, "")
} else {
desiredMS.Spec.DeletePolicy = ""
}
desiredMS.Spec.Template.Spec.NodeDrainTimeout = deployment.Spec.Template.Spec.NodeDrainTimeout
desiredMS.Spec.Template.Spec.NodeDeletionTimeout = deployment.Spec.Template.Spec.NodeDeletionTimeout
desiredMS.Spec.Template.Spec.NodeVolumeDetachTimeout = deployment.Spec.Template.Spec.NodeVolumeDetachTimeout
Expand Down
46 changes: 46 additions & 0 deletions internal/controllers/machinedeployment/machinedeployment_sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,52 @@ func TestComputeDesiredMachineSet(t *testing.T) {
g.Expect(err).To(BeNil())
assertMachineSet(g, actualMS, expectedMS)
})

t.Run("should compute the updated MachineSet when no old MachineSets exists (", func(t *testing.T) {
// Set rollout strategy to "OnDelete".
deployment := deployment.DeepCopy()
deployment.Spec.Strategy = &clusterv1.MachineDeploymentStrategy{
Type: clusterv1.OnDeleteMachineDeploymentStrategyType,
RollingUpdate: nil,
}

uniqueID := apirand.String(5)
existingMS := skeletonMSBasedOnMD.DeepCopy()
// computeDesiredMachineSet should retain the UID, name and the "machine-template-hash" label value
// of the existing machine.
// Other fields like labels, annotations, node timeout, etc are expected to change.
existingMSUID := types.UID("abc-123-uid")
existingMS.UID = existingMSUID
existingMS.Name = deployment.Name + "-" + uniqueID
existingMS.Labels = map[string]string{
clusterv1.MachineDeploymentUniqueLabel: uniqueID,
"ms-label-1": "ms-value-1",
}
existingMS.Annotations = nil
existingMS.Spec.Template.Labels = map[string]string{
clusterv1.MachineDeploymentUniqueLabel: uniqueID,
"ms-label-2": "ms-value-2",
}
existingMS.Spec.Template.Annotations = nil
existingMS.Spec.Template.Spec.NodeDrainTimeout = duration5s
existingMS.Spec.Template.Spec.NodeDeletionTimeout = duration5s
existingMS.Spec.Template.Spec.NodeVolumeDetachTimeout = duration5s
existingMS.Spec.DeletePolicy = string(clusterv1.NewestMachineSetDeletePolicy)
existingMS.Spec.MinReadySeconds = 0

expectedMS := skeletonMSBasedOnMD.DeepCopy()
expectedMS.UID = existingMSUID
expectedMS.Name = deployment.Name + "-" + uniqueID
expectedMS.Labels[clusterv1.MachineDeploymentUniqueLabel] = uniqueID
expectedMS.Spec.Template.Labels[clusterv1.MachineDeploymentUniqueLabel] = uniqueID
// DeletePolicy should be empty with rollout strategy "OnDelete".
expectedMS.Spec.DeletePolicy = ""

g := NewWithT(t)
actualMS, err := (&Reconciler{}).computeDesiredMachineSet(deployment, existingMS, nil, log)
g.Expect(err).To(BeNil())
assertMachineSet(g, actualMS, expectedMS)
})
}

func assertMachineSet(g *WithT, actualMS *clusterv1.MachineSet, expectedMS *clusterv1.MachineSet) {
Expand Down