Skip to content

Commit 6641e3a

Browse files
isabella-janssenisabella-janssen
committed
daemon & upgrade monitor: update references for updated v1alpha1 MCN api
1 parent 908e294 commit 6641e3a

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
@@ -631,14 +631,6 @@ func (p *PinnedImageSetManager) updateStatusError(pools []*mcfgv1.MachineConfigP
631631
return fmt.Errorf("failed to get image set apply configs: %w", err)
632632
}
633633

634-
var errMsg string
635-
if isErrNoSpace(statusErr) {
636-
// degrade the pool if there is no space
637-
errMsg = fmt.Sprintf("%s %v", degradeMessagePrefix, statusErr)
638-
} else {
639-
errMsg = statusErr.Error()
640-
}
641-
642634
// Get MCP associated with node
643635
pool, err := helpers.GetPrimaryPoolNameForMCN(p.mcpLister, node)
644636
if err != nil {
@@ -649,7 +641,7 @@ func (p *PinnedImageSetManager) updateStatusError(pools []*mcfgv1.MachineConfigP
649641
&upgrademonitor.Condition{
650642
State: mcfgv1alpha1.MachineConfigNodePinnedImageSetsDegraded,
651643
Reason: "PrefetchFailed",
652-
Message: errMsg,
644+
Message: "One or more PinnedImageSet is experiencing an error. See PinnedImageSet list for more details",
653645
},
654646
nil,
655647
metav1.ConditionTrue,
@@ -699,7 +691,7 @@ func (p *PinnedImageSetManager) createApplyConfigForImageSet(imageSet *mcfgv1.Pi
699691

700692
if statusErr != nil {
701693
imageSetConfig.LastFailedGeneration = ptr.To(int32(imageSet.GetGeneration()))
702-
imageSetConfig.LastFailedGenerationErrors = []string{statusErr.Error()}
694+
imageSetConfig.LastFailedGenerationError = ptr.To(statusErr.Error())
703695
} else if isCompleted {
704696
// only set the current generation if prefetch is complete
705697
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,
@@ -1173,10 +1173,10 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
11731173

11741174
if reconcilableError != nil {
11751175
Nerr := upgrademonitor.GenerateAndApplyMachineConfigNodes(
1176-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdateCompatible), Message: fmt.Sprintf("Update Failed during the Checking for Compatibility phase")},
1177-
&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())},
1178-
metav1.ConditionUnknown,
1176+
&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())},
1177+
nil,
11791178
metav1.ConditionUnknown,
1179+
metav1.ConditionFalse,
11801180
dn.node,
11811181
dn.mcfgClient,
11821182
dn.featureGatesAccessor,
@@ -1220,10 +1220,10 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
12201220

12211221
if err != nil {
12221222
Nerr := upgrademonitor.GenerateAndApplyMachineConfigNodes(
1223-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdateCompatible), Message: "Update Failed during the Checking for Compatibility phase."},
1224-
&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())},
1225-
metav1.ConditionUnknown,
1223+
&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())},
1224+
nil,
12261225
metav1.ConditionUnknown,
1226+
metav1.ConditionFalse,
12271227
dn.node,
12281228
dn.mcfgClient,
12291229
dn.featureGatesAccessor,
@@ -1255,10 +1255,10 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
12551255
}
12561256
}
12571257
err = upgrademonitor.GenerateAndApplyMachineConfigNodes(
1258-
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdateCompatible), Message: "Update is Compatible."},
1259-
&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)},
1260-
metav1.ConditionTrue,
1258+
&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdatePrepared, Reason: string(mcfgalphav1.MachineConfigNodeUpdatePrepared), Message: fmt.Sprintf("Update Compatible. Post Cfg Actions: %v Drain Required: %t", actions, drain)},
1259+
nil,
12611260
metav1.ConditionTrue,
1261+
metav1.ConditionFalse,
12621262
dn.node,
12631263
dn.mcfgClient,
12641264
dn.featureGatesAccessor,

‎pkg/upgrademonitor/upgrade_monitor.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,10 @@ func generateAndApplyMachineConfigNodes(
144144
mcfgalphav1.MachineConfigNodeUpdatePostActionComplete,
145145
mcfgalphav1.MachineConfigNodeUpdateComplete,
146146
mcfgalphav1.MachineConfigNodeResumed,
147-
mcfgalphav1.MachineConfigNodeUpdateCompatible,
148147
mcfgalphav1.MachineConfigNodeUpdateDrained,
149148
mcfgalphav1.MachineConfigNodeUpdateFilesAndOS,
150149
mcfgalphav1.MachineConfigNodeUpdateCordoned,
151150
mcfgalphav1.MachineConfigNodeUpdateRebooted,
152-
mcfgalphav1.MachineConfigNodeUpdateReloaded,
153151
mcfgalphav1.MachineConfigNodeUpdated,
154152
mcfgalphav1.MachineConfigNodeUpdateUncordoned,
155153
}
@@ -269,11 +267,11 @@ func generateAndApplyMachineConfigNodes(
269267
if imageSetApplyConfig == nil {
270268
for _, imageSet := range newMCNode.Status.PinnedImageSets {
271269
statusApplyConfig = statusApplyConfig.WithPinnedImageSets(&machineconfigurationalphav1.MachineConfigNodeStatusPinnedImageSetApplyConfiguration{
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-
LastFailedGenerationErrors: imageSet.LastFailedGenerationErrors,
270+
DesiredGeneration: ptr.To(imageSet.DesiredGeneration),
271+
CurrentGeneration: ptr.To(imageSet.CurrentGeneration),
272+
Name: ptr.To(imageSet.Name),
273+
LastFailedGeneration: ptr.To(imageSet.LastFailedGeneration),
274+
LastFailedGenerationError: ptr.To(imageSet.LastFailedGenerationError),
277275
})
278276
}
279277
} else if len(imageSetApplyConfig) > 0 {

0 commit comments

Comments
 (0)