MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -807,6 +807,14 @@ func (optr *Operator) syncMachineConfigNodes(_ *renderConfig, _ *configv1.Cluste | |
| }, | ||
| }, | ||
| } | ||
|
|
||
| //Add: check if image mode status reporting fg is enables and if yes, use 821-826 as a guideline for configImage initialization | ||
| if fg.Enabled(features.FeatureGateImageModeStatusReporting) { | ||
| newMCS.Spec.ConfigImage = mcfgv1.MachineConfigNodeSpecConfigImage{ | ||
| DesiredImage: mcfgv1.ImageDigestFormat(node.Annotations[daemonconsts.DesiredImageAnnotationKey]), | ||
| } | ||
| } | ||
|
Member
There was a problem hiding this comment. I think how we handle this depends on the decision made this thread on the API review (openshift/api#2383) on whether the configImage value is required or not and what it means for whether OCL is enabled or not. If
|
||
|
|
||
| mcsBytes, err := json.Marshal(newMCS) | ||
| if err != nil { | ||
| klog.Errorf("error rendering asset for MachineConfigNode %v", err) | ||
|
|
@@ -817,6 +825,7 @@ func (optr *Operator) syncMachineConfigNodes(_ *renderConfig, _ *configv1.Cluste | |
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // if this is the first time we are applying the MCN and the node is ready, set the config version probably | ||
| if mcn.Spec.ConfigVersion.Desired == upgrademonitor.NotYetSet { | ||
| err = upgrademonitor.GenerateAndApplyMachineConfigNodeSpec(optr.fgAccessor, pool, node, optr.client) | ||
|
|
@@ -825,7 +834,17 @@ func (optr *Operator) syncMachineConfigNodes(_ *renderConfig, _ *configv1.Cluste | |
| } | ||
| } | ||
|
|
||
| if fg.Enabled(features.FeatureGateImageModeStatusReporting) { | ||
| if mcn.Spec.ConfigImage.DesiredImage == upgrademonitor.NotYetSet { | ||
| err = upgrademonitor.GenerateAndApplyMachineConfigNodeSpec(optr.fgAccessor, pool, node, optr.client) | ||
| if err != nil { | ||
| klog.Errorf("Error making MCN spec for Update Compatible: %v", err) | ||
| } | ||
| } | ||
| } | ||
|
Member
There was a problem hiding this comment. Is this duplicative of lines 829-835? If I'm understanding this added conditional correctly,
|
||
|
|
||
| } | ||
|
|
||
| if mcns != nil { | ||
| for _, mcn := range mcns.Items { | ||
| if _, ok := nodeMap[mcn.Name]; !ok { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function is responsible for extracting the ocl image from the mc if it exists. I think that function should work, buttt I'm not sure that this reporting should go here for a couple of reasons.
I think update is a good place to put this work but we just want to ensure the timing is correct!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can add code to handle the empty string case but where do you recommend adding this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe after applyOSChanges has succeeded- meaning the image was pulled and the OS was rebased successfully.