Skip to content

Commit b962bff

Browse files
authored
Merge pull request kubernetes-sigs#10876 from chrischdi/pr-fix-dockermachinepool-nil-pointer
🐛 capd: fix nil pointer in dockermachinepool controller
2 parents 6541888 + 6d30801 commit b962bff

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,16 +312,19 @@ func (r *DockerMachinePoolReconciler) deleteMachinePoolMachine(ctx context.Conte
312312
// propagateMachineDeleteAnnotation returns the DockerMachines for a MachinePool and for each DockerMachine, it copies the owner
313313
// Machine's delete annotation to each DockerMachine if it's present. This is done just in time to ensure that the annotations are
314314
// up to date when we sort for DockerMachine deletion.
315-
func (r *DockerMachinePoolReconciler) propagateMachineDeleteAnnotation(ctx context.Context, dockerMachineSet map[string]infrav1.DockerMachine) ([]infrav1.DockerMachine, error) {
315+
func (r *DockerMachinePoolReconciler) propagateMachineDeleteAnnotation(ctx context.Context, dockerMachineMap map[string]infrav1.DockerMachine) ([]infrav1.DockerMachine, error) {
316316
_ = ctrl.LoggerFrom(ctx)
317317

318318
dockerMachines := []infrav1.DockerMachine{}
319-
for _, dockerMachine := range dockerMachineSet {
319+
for _, dockerMachine := range dockerMachineMap {
320320
machine, err := util.GetOwnerMachine(ctx, r.Client, dockerMachine.ObjectMeta)
321321
if err != nil {
322322
return nil, errors.Wrapf(err, "error getting owner Machine for DockerMachine %s/%s", dockerMachine.Namespace, dockerMachine.Name)
323323
}
324324
if machine != nil && machine.Annotations != nil {
325+
if dockerMachine.Annotations == nil {
326+
dockerMachine.Annotations = map[string]string{}
327+
}
325328
if _, hasDeleteAnnotation := machine.Annotations[clusterv1.DeleteMachineAnnotation]; hasDeleteAnnotation {
326329
dockerMachine.Annotations[clusterv1.DeleteMachineAnnotation] = machine.Annotations[clusterv1.DeleteMachineAnnotation]
327330
}

0 commit comments

Comments
 (0)