clean up alert messages

Author: isabella-janssen

pkg/daemon/update.go

@@ -2583,9 +2583,8 @@ func (dn *Daemon) updateLayeredOS(config *mcfgv1.MachineConfig) error {
 	} else {
 		// Report ImagePulledFromRegistry condition as unknown (pulling)
 		if dn.fgHandler != nil && dn.fgHandler.Enabled(features.FeatureGateImageModeStatusReporting) {
-			// TODO: update the message to not contain code location
 			err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
-				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Pulling OS image %s from registry; update.go, line 2585", newURL)},
+				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Pulling OS image %s from registry", newURL)},
 				nil,
 				metav1.ConditionUnknown,
 				metav1.ConditionFalse,
@@ -2617,9 +2616,8 @@ func (dn *Daemon) updateLayeredOS(config *mcfgv1.MachineConfig) error {
 		}); err != nil {
 			// Report ImagePulledFromRegistry condition as false (failed)
 			if dn.fgHandler != nil && dn.fgHandler.Enabled(features.FeatureGateImageModeStatusReporting) {
-				// TODO: update the message to not contain code location
 				err = upgrademonitor.GenerateAndApplyMachineConfigNodes(
-					&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Failed to pull OS image %s from registry: %v; update.go, line 2622", newURL, err)},
+					&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Failed to pull OS image %s from registry: %v", newURL, err)},
 					nil,
 					metav1.ConditionFalse,
 					metav1.ConditionFalse,
@@ -2637,9 +2635,8 @@ func (dn *Daemon) updateLayeredOS(config *mcfgv1.MachineConfig) error {
 
 		// Report ImagePulledFromRegistry condition as true (success)
 		if dn.fgHandler != nil && dn.fgHandler.Enabled(features.FeatureGateImageModeStatusReporting) {
-			// TODO: update the message to not contain code location
 			err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
-				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Successfully pulled OS image %s from registry; update.go, line 2642", newURL)},
+				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Successfully pulled OS image %s from registry", newURL)},
 				nil,
 				metav1.ConditionTrue,
 				metav1.ConditionFalse,
@@ -2816,9 +2813,8 @@ func (dn *CoreOSDaemon) applyLayeredOSChanges(mcDiff machineConfigDiff, oldConfi
 
 		// Report ImagePulledFromRegistry condition as unknown (pulling)
 		if dn.fgHandler != nil && dn.fgHandler.Enabled(features.FeatureGateImageModeStatusReporting) {
-			// TODO: update the message to not contain code location
 			err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
-				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Pulling image %s from registry; update.go, line 2821", newConfig.Spec.BaseOSExtensionsContainerImage)},
+				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Pulling image %s from registry", newConfig.Spec.BaseOSExtensionsContainerImage)},
 				nil,
 				metav1.ConditionUnknown,
 				metav1.ConditionFalse,
@@ -2835,9 +2831,8 @@ func (dn *CoreOSDaemon) applyLayeredOSChanges(mcDiff machineConfigDiff, oldConfi
 		if osExtensionsContentDir, err = ExtractExtensionsImage(newConfig.Spec.BaseOSExtensionsContainerImage); err != nil {
 			// Report ImagePulledFromRegistry condition as false (failed)
 			if dn.fgHandler != nil && dn.fgHandler.Enabled(features.FeatureGateImageModeStatusReporting) {
-				// TODO: update the message to not contain code location
 				err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
-					&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Failed to pull image %s from registry: %v; update.go, line 2840", newConfig.Spec.BaseOSExtensionsContainerImage, err)},
+					&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Failed to pull image %s from registry: %v", newConfig.Spec.BaseOSExtensionsContainerImage, err)},
 					nil,
 					metav1.ConditionFalse,
 					metav1.ConditionFalse,
@@ -2855,9 +2850,8 @@ func (dn *CoreOSDaemon) applyLayeredOSChanges(mcDiff machineConfigDiff, oldConfi
 
 		// Report ImagePulledFromRegistry condition as true (success)
 		if dn.fgHandler != nil && dn.fgHandler.Enabled(features.FeatureGateImageModeStatusReporting) {
-			// TODO: update the message to not contain code location
 			err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
-				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Successfully pulled image %s from registry; update.go, line 2861", newConfig.Spec.BaseOSExtensionsContainerImage)},
+				&upgrademonitor.Condition{State: mcfgv1.MachineConfigNodeImagePulledFromRegistry, Reason: string(mcfgv1.MachineConfigNodeImagePulledFromRegistry), Message: fmt.Sprintf("Successfully pulled image %s from registry", newConfig.Spec.BaseOSExtensionsContainerImage)},
 				nil,
 				metav1.ConditionTrue,
 				metav1.ConditionFalse,