Skip to content

Commit a4293c8

Browse files
authored
Merge pull request #10877 from k8s-infra-cherrypick-robot/cherry-pick-10876-to-release-1.7
[release-1.7] 🐛 capd: fix nil pointer in dockermachinepool controller
2 parents eb19a98 + 28e01c6 commit a4293c8

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
@@ -309,16 +309,19 @@ func (r *DockerMachinePoolReconciler) deleteMachinePoolMachine(ctx context.Conte
309309
// propagateMachineDeleteAnnotation returns the DockerMachines for a MachinePool and for each DockerMachine, it copies the owner
310310
// Machine's delete annotation to each DockerMachine if it's present. This is done just in time to ensure that the annotations are
311311
// up to date when we sort for DockerMachine deletion.
312-
func (r *DockerMachinePoolReconciler) propagateMachineDeleteAnnotation(ctx context.Context, dockerMachineSet map[string]infrav1.DockerMachine) ([]infrav1.DockerMachine, error) {
312+
func (r *DockerMachinePoolReconciler) propagateMachineDeleteAnnotation(ctx context.Context, dockerMachineMap map[string]infrav1.DockerMachine) ([]infrav1.DockerMachine, error) {
313313
_ = ctrl.LoggerFrom(ctx)
314314

315315
dockerMachines := []infrav1.DockerMachine{}
316-
for _, dockerMachine := range dockerMachineSet {
316+
for _, dockerMachine := range dockerMachineMap {
317317
machine, err := util.GetOwnerMachine(ctx, r.Client, dockerMachine.ObjectMeta)
318318
if err != nil {
319319
return nil, errors.Wrapf(err, "error getting owner Machine for DockerMachine %s/%s", dockerMachine.Namespace, dockerMachine.Name)
320320
}
321321
if machine != nil && machine.Annotations != nil {
322+
if dockerMachine.Annotations == nil {
323+
dockerMachine.Annotations = map[string]string{}
324+
}
322325
if _, hasDeleteAnnotation := machine.Annotations[clusterv1.DeleteMachineAnnotation]; hasDeleteAnnotation {
323326
dockerMachine.Annotations[clusterv1.DeleteMachineAnnotation] = machine.Annotations[clusterv1.DeleteMachineAnnotation]
324327
}

0 commit comments

Comments
 (0)