Skip to content

Commit a102245

Browse files
authored
Merge pull request #5319 from sdodson/OCPBUGS-62493
OCPBUGS-62493: Only fire OSImageURLOverridden and set metrics on changes
2 parents 7bd71c9 + 8988ae4 commit a102245

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/controller/render/render_controller.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,11 @@ func (ctrl *Controller) syncGeneratedMachineConfig(pool *mcfgv1.MachineConfigPoo
560560
return fmt.Errorf("could not generate rendered MachineConfig: %w", err)
561561
}
562562

563-
// Emit event and collect metric when OSImageURL was overridden.
563+
// Collect metric when OSImageURL was overridden
564+
var isOSImageURLOverridden bool
564565
if generated.Spec.OSImageURL != ctrlcommon.GetDefaultBaseImageContainer(&cc.Spec) {
565566
ctrlcommon.OSImageURLOverride.WithLabelValues(pool.Name).Set(1)
566-
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)
567+
isOSImageURLOverridden = true
567568
} else {
568569
// Reset metric when OSImageURL has not been overridden
569570
ctrlcommon.OSImageURLOverride.WithLabelValues(pool.Name).Set(0)
@@ -577,6 +578,9 @@ func (ctrl *Controller) syncGeneratedMachineConfig(pool *mcfgv1.MachineConfigPoo
577578
if err != nil {
578579
return err
579580
}
581+
if isOSImageURLOverridden {
582+
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)
583+
}
580584
klog.V(2).Infof("Generated machineconfig %s from %d configs: %s", generated.Name, len(source), source)
581585
ctrl.eventRecorder.Eventf(pool, corev1.EventTypeNormal, "RenderedConfigGenerated", "%s successfully generated (release version: %s, controller version: %s)",
582586
generated.Name, generated.Annotations[ctrlcommon.ReleaseImageVersionAnnotationKey], generated.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey])

0 commit comments

Comments
 (0)