Skip to content

Commit 3353da9

Browse files
isabella-janssenisabella-janssen
committed
daemon & upgrade monitor: update references for updated v1alpha1 MCN api
1 parent c9370b7 commit 3353da9

File tree

4 files changed

+23
-32
lines changed

4 files changed

+23
-32
lines changed

‎pkg/controller/node/status.go

+1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ func (ctrl *Controller) calculateStatus(fg featuregates.FeatureGate, mcs []*mcfg
174174
case mcfgv1alpha1.MachineConfigNodeResumed:
175175
updatingMachines = append(updatedMachines, ourNode) //nolint:gocritic
176176
readyMachines = append(readyMachines, ourNode)
177+
// Note (ijanssen): `MachineConfigNodeUpdateCompatible` was removed with MCO-1543. This case will need to be replaced/removed when working on MCO-1228.
177178
case mcfgv1alpha1.MachineConfigNodeUpdateCompatible:
178179
updatingMachines = append(updatedMachines, ourNode) //nolint:gocritic
179180
case mcfgv1alpha1.MachineConfigNodeUpdateDrained:

‎pkg/daemon/pinned_image_set.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -637,14 +637,6 @@ func (p *PinnedImageSetManager) updateStatusError(pools []*mcfgv1.MachineConfigP
637637
}
638638
imageSetSpec := getPinnedImageSetSpecForPools(pools)
639639

640-
var errMsg string
641-
if isErrNoSpace(statusErr) {
642-
// degrade the pool if there is no space
643-
errMsg = fmt.Sprintf("%s %v", degradeMessagePrefix, statusErr)
644-
} else {
645-
errMsg = statusErr.Error()
646-
}
647-
648640
// Get MCP associated with node
649641
pool, err := helpers.GetPrimaryPoolNameForMCN(p.mcpLister, node)
650642
if err != nil {
@@ -655,7 +647,7 @@ func (p *PinnedImageSetManager) updateStatusError(pools []*mcfgv1.MachineConfigP
655647
&upgrademonitor.Condition{
656648
State: mcfgv1alpha1.MachineConfigNodePinnedImageSetsDegraded,
657649
Reason: "PrefetchFailed",
658-
Message: errMsg,
650+
Message: "One or more PinnedImageSet is experiencing an error. See PinnedImageSet list for more details",
659651
},
660652
nil,
661653
metav1.ConditionTrue,
@@ -706,7 +698,7 @@ func (p *PinnedImageSetManager) createApplyConfigForImageSet(imageSet *mcfgv1.Pi
706698

707699
if statusErr != nil {
708700
imageSetConfig.LastFailedGeneration = ptr.To(int32(imageSet.GetGeneration()))
709-
imageSetConfig.LastFailedGenerationErrors = []string{statusErr.Error()}
701+
imageSetConfig.LastFailedGenerationError = ptr.To(statusErr.Error())
710702
} else if isCompleted {
711703
// only set the current generation if prefetch is complete
712704
imageSetConfig.CurrentGeneration = ptr.To(int32(imageSet.GetGeneration()))

‎pkg/daemon/update.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ func (dn *Daemon) executeReloadServiceNodeDisruptionAction(serviceName string, r
131131
}
132132

133133
err = upgrademonitor.GenerateAndApplyMachineConfigNodes(
134-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePostActionComplete, Reason: string(mcfgalphav1.MachineConfigNodeUpdateReloaded), Message: fmt.Sprintf("Node has reloaded service %s", serviceName)},
135-
&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)},
136-
metav1.ConditionTrue,
134+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePostActionComplete, Reason: string(mcfgalphav1.MachineConfigNodeUpdatePostActionComplete), Message: fmt.Sprintf("Node has reloaded service %s", serviceName)},
135+
nil,
137136
metav1.ConditionTrue,
137+
metav1.ConditionFalse,
138138
dn.node,
139139
dn.mcfgClient,
140140
dn.featureGatesAccessor,
@@ -324,10 +324,10 @@ func (dn *Daemon) performPostConfigChangeAction(postConfigChangeActions []string
324324
}
325325

326326
err := upgrademonitor.GenerateAndApplyMachineConfigNodes(
327-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePostActionComplete, Reason: string(mcfgalphav1.MachineConfigNodeUpdateReloaded), Message: "Node has reloaded CRIO"},
328-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateReloaded, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdatePostActionComplete), string(mcfgalphav1.MachineConfigNodeUpdateReloaded)), Message: "Upgrade required a CRIO reload. Completed this this as the post update action."},
329-
metav1.ConditionTrue,
327+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePostActionComplete, Reason: string(mcfgalphav1.MachineConfigNodeUpdatePostActionComplete), Message: "Node has reloaded CRIO"},
328+
nil,
330329
metav1.ConditionTrue,
330+
metav1.ConditionFalse,
331331
dn.node,
332332
dn.mcfgClient,
333333
dn.featureGatesAccessor,
@@ -1161,10 +1161,10 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
11611161

11621162
if reconcilableError != nil {
11631163
Nerr := upgrademonitor.GenerateAndApplyMachineConfigNodes(
1164-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdateCompatible), Message: fmt.Sprintf("Update Failed during the Checking for Compatibility phase")},
1165-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateCompatible, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdatePrepared), string(mcfgalphav1.MachineConfigNodeUpdateCompatible)), Message: fmt.Sprintf("Error: MachineConfigs %v and %v are not compatible. Err: %s", oldConfigName, newConfigName, reconcilableError.Error())},
1166-
metav1.ConditionUnknown,
1164+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdatePrepared), Message: fmt.Sprintf("Update Failed compatibility validation. MachineConfigs %v and %v are not compatible. Err: %s", oldConfigName, newConfigName, reconcilableError.Error())},
1165+
nil,
11671166
metav1.ConditionUnknown,
1167+
metav1.ConditionFalse,
11681168
dn.node,
11691169
dn.mcfgClient,
11701170
dn.featureGatesAccessor,
@@ -1208,10 +1208,10 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
12081208

12091209
if err != nil {
12101210
Nerr := upgrademonitor.GenerateAndApplyMachineConfigNodes(
1211-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdateCompatible), Message: "Update Failed during the Checking for Compatibility phase."},
1212-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateCompatible, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdatePrepared), string(mcfgalphav1.MachineConfigNodeUpdateCompatible)), Message: fmt.Sprintf("Error: MachineConfigs %v and %v are not available for update. Error calculating post config change actions: %s", oldConfigName, newConfigName, err.Error())},
1213-
metav1.ConditionUnknown,
1211+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdatePrepared), Message: fmt.Sprintf("Update Failed compatibility validation. MachineConfigs %v and %v are not available for update. Error calculating post config change actions: %s", oldConfigName, newConfigName, err.Error())},
1212+
nil,
12141213
metav1.ConditionUnknown,
1214+
metav1.ConditionFalse,
12151215
dn.node,
12161216
dn.mcfgClient,
12171217
dn.featureGatesAccessor,
@@ -1243,10 +1243,10 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
12431243
}
12441244
}
12451245
err = upgrademonitor.GenerateAndApplyMachineConfigNodes(
1246-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdateCompatible), Message: "Update is Compatible."},
1247-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateCompatible, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdatePrepared), string(mcfgalphav1.MachineConfigNodeUpdateCompatible)), Message: fmt.Sprintf("Update Compatible. Post Cfg Actions %v: Drain Required: %t", actions, drain)},
1248-
metav1.ConditionTrue,
1246+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdatePrepared), Message: fmt.Sprintf("Update Compatible. Post Cfg Actions: %v Drain Required: %t", actions, drain)},
1247+
nil,
12491248
metav1.ConditionTrue,
1249+
metav1.ConditionFalse,
12501250
dn.node,
12511251
dn.mcfgClient,
12521252
dn.featureGatesAccessor,

‎pkg/upgrademonitor/upgrade_monitor.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,10 @@ func generateAndApplyMachineConfigNodes(
146146
mcfgalphav1.MachineConfigNodeUpdatePostActionComplete,
147147
mcfgalphav1.MachineConfigNodeUpdateComplete,
148148
mcfgalphav1.MachineConfigNodeResumed,
149-
mcfgalphav1.MachineConfigNodeUpdateCompatible,
150149
mcfgalphav1.MachineConfigNodeUpdateDrained,
151150
mcfgalphav1.MachineConfigNodeUpdateFilesAndOS,
152151
mcfgalphav1.MachineConfigNodeUpdateCordoned,
153152
mcfgalphav1.MachineConfigNodeUpdateRebooted,
154-
mcfgalphav1.MachineConfigNodeUpdateReloaded,
155153
mcfgalphav1.MachineConfigNodeUpdated,
156154
mcfgalphav1.MachineConfigNodeUpdateUncordoned,
157155
}
@@ -271,11 +269,11 @@ func generateAndApplyMachineConfigNodes(
271269
if imageSetApplyConfig == nil {
272270
for _, imageSet := range newMCNode.Status.PinnedImageSets {
273271
statusApplyConfig = statusApplyConfig.WithPinnedImageSets(&machineconfigurationalphav1.MachineConfigNodeStatusPinnedImageSetApplyConfiguration{
274-
DesiredGeneration: ptr.To(imageSet.DesiredGeneration),
275-
CurrentGeneration: ptr.To(imageSet.CurrentGeneration),
276-
Name: ptr.To(imageSet.Name),
277-
LastFailedGeneration: ptr.To(imageSet.LastFailedGeneration),
278-
LastFailedGenerationErrors: imageSet.LastFailedGenerationErrors,
272+
DesiredGeneration: ptr.To(imageSet.DesiredGeneration),
273+
CurrentGeneration: ptr.To(imageSet.CurrentGeneration),
274+
Name: ptr.To(imageSet.Name),
275+
LastFailedGeneration: ptr.To(imageSet.LastFailedGeneration),
276+
LastFailedGenerationError: ptr.To(imageSet.LastFailedGenerationError),
279277
})
280278
}
281279
} else if len(imageSetApplyConfig) > 0 {

0 commit comments

Comments
 (0)