Merge pull request #4942 from helio/fix-panic-log

k8s-ci-robot · web-flow · commit 23d7bacaaa80 · 2024-06-26T09:12:21.000-07:00
fix: panic in MachinePool log
diff --git a/azure/scope/machinepool.go b/azure/scope/machinepool.go
@@ -533,7 +533,7 @@ func (m *MachinePoolScope) DeleteMachine(ctx context.Context, ampm infrav1exp.Az
 		return errors.Wrapf(err, "error getting owner Machine for AzureMachinePoolMachine %s/%s", ampm.Namespace, ampm.Name)
 	}
 	if machine == nil {
-		log.V(2).Info("No owner Machine exists for AzureMachinePoolMachine", ampm, klog.KObj(&ampm))
+		log.V(2).Info("No owner Machine exists for AzureMachinePoolMachine", "ampm", klog.KObj(&ampm))
 		// If the AzureMachinePoolMachine does not have an owner Machine, do not attempt to delete the AzureMachinePoolMachine as the MachinePool controller will create the
 		// Machine and we want to let it catch up. If we are too hasty to delete, that introduces a race condition where the AzureMachinePoolMachine could be deleted
 		// just as the Machine comes online.

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ func (m *MachinePoolScope) DeleteMachine(ctx context.Context, ampm infrav1exp.Az`
`533`	`533`	`return errors.Wrapf(err, "error getting owner Machine for AzureMachinePoolMachine %s/%s", ampm.Namespace, ampm.Name)`
`534`	`534`	`}`
`535`	`535`	`if machine == nil {`
`536`		`- log.V(2).Info("No owner Machine exists for AzureMachinePoolMachine", ampm, klog.KObj(&ampm))`
	`536`	`+ log.V(2).Info("No owner Machine exists for AzureMachinePoolMachine", "ampm", klog.KObj(&ampm))`
`537`	`537`	`// If the AzureMachinePoolMachine does not have an owner Machine, do not attempt to delete the AzureMachinePoolMachine as the MachinePool controller will create the`
`538`	`538`	`// Machine and we want to let it catch up. If we are too hasty to delete, that introduces a race condition where the AzureMachinePoolMachine could be deleted`
`539`	`539`	`// just as the Machine comes online.`