Merge pull request #1360 from theobarberbany/fix-ms-nilref

openshift-merge-bot[bot] · web-flow · commit fca6b41db6bf · 2025-04-29T22:45:22.000Z
OCPBUGS-55461: Fix updateMachineSetStatus nil pointer
diff --git a/pkg/controller/machineset/controller.go b/pkg/controller/machineset/controller.go
@@ -190,7 +190,7 @@ func (r *ReconcileMachineSet) Reconcile(ctx context.Context, request reconcile.R
 
 			machineSet, err := updateMachineSetStatus(r.Client, machineSet, machineSetCopy.Status)
 			if err != nil {
-				klog.Errorf("%v: error updating status: %v", machineSet.Name, err)
+				klog.Errorf("%v: error updating status: %v", machineSetCopy.Name, err)
 			}
 
 			klog.Infof("%v: machine set is paused, taking no further action", machineSet.Name)
@@ -214,7 +214,7 @@ func (r *ReconcileMachineSet) Reconcile(ctx context.Context, request reconcile.R
 		))
 		machineSet, err := updateMachineSetStatus(r.Client, machineSet, machineSetCopy.Status)
 		if err != nil {
-			klog.Errorf("%v: error updating status: %v", machineSet.Name, err)
+			klog.Errorf("%v: error updating status: %v", machineSetCopy.Name, err)
 		}
 		klog.Infof("%v: setting paused to false and continuing reconcile", machineSet.Name)
 	}

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func (r *ReconcileMachineSet) Reconcile(ctx context.Context, request reconcile.R`
`190`	`190`
`191`	`191`	`machineSet, err := updateMachineSetStatus(r.Client, machineSet, machineSetCopy.Status)`
`192`	`192`	`if err != nil {`
`193`		`- klog.Errorf("%v: error updating status: %v", machineSet.Name, err)`
	`193`	`+ klog.Errorf("%v: error updating status: %v", machineSetCopy.Name, err)`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`klog.Infof("%v: machine set is paused, taking no further action", machineSet.Name)`
`@@ -214,7 +214,7 @@ func (r *ReconcileMachineSet) Reconcile(ctx context.Context, request reconcile.R`
`214`	`214`	`))`
`215`	`215`	`machineSet, err := updateMachineSetStatus(r.Client, machineSet, machineSetCopy.Status)`
`216`	`216`	`if err != nil {`
`217`		`- klog.Errorf("%v: error updating status: %v", machineSet.Name, err)`
	`217`	`+ klog.Errorf("%v: error updating status: %v", machineSetCopy.Name, err)`
`218`	`218`	`}`
`219`	`219`	`klog.Infof("%v: setting paused to false and continuing reconcile", machineSet.Name)`
`220`	`220`	`}`