Skip to content

Commit 805bc69

Browse files
Merge pull request #4927 from openshift-cherrypick-robot/cherry-pick-4914-to-release-4.18
[release-4.18] OCPBUGS-53306: Fixing typos for MachineConfigNode
2 parents 46eed2b + 5e97549 commit 805bc69

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: pkg/daemon/update.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (dn *Daemon) executeReloadServiceNodeDisruptionAction(serviceName string, r
125125

126126
err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
127127
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePostActionComplete, Reason: string(mcfgalphav1.MachineConfigNodeUpdateReloaded), Message: fmt.Sprintf("Node has reloaded service %s", serviceName)},
128-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateReloaded, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdatePostActionComplete), string(mcfgalphav1.MachineConfigNodeUpdateReloaded)), Message: fmt.Sprintf("Upgrade required a service %s reload. Completed this this as a post update action.", serviceName)},
128+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateReloaded, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdatePostActionComplete), string(mcfgalphav1.MachineConfigNodeUpdateReloaded)), Message: fmt.Sprintf("Upgrade required a service %s reload. Completed this as a post update action.", serviceName)},
129129
metav1.ConditionTrue,
130130
metav1.ConditionTrue,
131131
dn.node,

Diff for: pkg/upgrademonitor/upgrade_monitor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func generateAndApplyMachineConfigNodes(
182182
metav1.Condition{
183183
Type: string(condType),
184184
Message: fmt.Sprintf("This node has not yet entered the %s phase", string(condType)),
185-
Reason: "NotYetOccured",
185+
Reason: "NotYetOccurred",
186186
LastTransitionTime: metav1.Now(),
187187
Status: metav1.ConditionFalse,
188188
})

0 commit comments

Comments
 (0)