Merge pull request #5319 from sdodson/OCPBUGS-62493

OCPBUGS-62493: Only fire OSImageURLOverridden and set metrics on changes

Author: sdodson

pkg/controller/render/render_controller.go

@@ -560,10 +560,11 @@ func (ctrl *Controller) syncGeneratedMachineConfig(pool *mcfgv1.MachineConfigPoo
 		return fmt.Errorf("could not generate rendered MachineConfig: %w", err)
 	}
 
-	// Emit event and collect metric when OSImageURL was overridden.
+	// Collect metric when OSImageURL was overridden
+	var isOSImageURLOverridden bool
 	if generated.Spec.OSImageURL != ctrlcommon.GetDefaultBaseImageContainer(&cc.Spec) {
 		ctrlcommon.OSImageURLOverride.WithLabelValues(pool.Name).Set(1)
-		ctrl.eventRecorder.Eventf(generated, corev1.EventTypeNormal, "OSImageURLOverridden", "OSImageURL was overridden via machineconfig in %s (was: %s is: %s)", generated.Name, cc.Spec.OSImageURL, generated.Spec.OSImageURL)
+		isOSImageURLOverridden = true
 	} else {
 		// Reset metric when OSImageURL has not been overridden
 		ctrlcommon.OSImageURLOverride.WithLabelValues(pool.Name).Set(0)
@@ -577,6 +578,9 @@ func (ctrl *Controller) syncGeneratedMachineConfig(pool *mcfgv1.MachineConfigPoo
 		if err != nil {
 			return err
 		}
+		if isOSImageURLOverridden {
+			ctrl.eventRecorder.Eventf(generated, corev1.EventTypeNormal, "OSImageURLOverridden", "OSImageURL was overridden via machineconfig in %s (was: %s is: %s)", generated.Name, cc.Spec.OSImageURL, generated.Spec.OSImageURL)
+		}
 		klog.V(2).Infof("Generated machineconfig %s from %d configs: %s", generated.Name, len(source), source)
 		ctrl.eventRecorder.Eventf(pool, corev1.EventTypeNormal, "RenderedConfigGenerated", "%s successfully generated (release version: %s, controller version: %s)",
 			generated.Name, generated.Annotations[ctrlcommon.ReleaseImageVersionAnnotationKey], generated.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey])