operator: fix ManagedOSVersionChannel sync #769
Merged
Conversation
This file contains 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
fgiudici
commented
Jun 19, 2024
| @@ -367,6 +367,9 @@ func (r *ManagedOSVersionChannelReconciler) createManagedOSVersions(ctx context. | |||
| if lastSyncTime, found := version.Annotations[elementalv1.ElementalManagedOSVersionChannelLastSyncAnnotation]; !found || (lastSyncTime != syncTimestamp) { | |||
| logger.Info("ManagedOSVersion no longer synced through this channel", "name", version.Name) | |||
| patchBase := client.MergeFrom(version.DeepCopy()) | |||
| if version.ObjectMeta.Annotations == nil { | |||
fgiudici
commented
Jun 19, 2024
| @@ -460,6 +463,12 @@ func (r *ManagedOSVersionChannelReconciler) createSyncerPod(ctx context.Context, | |||
| return err | |||
| } | |||
|
|
|||
| // If we don't update the LastSyncedTime on Pod creation, we will loop | |||
There was a problem hiding this comment.
We need this to avoid reachedNextInterval at line 181 of this same file to keep being true which would land to a create/delete infinite loop
fgiudici
added
the
need/backport
After the very fist initial sync, all subsequently channel syncs fail. Fixed. fixes: rancher#766 Signed-off-by: Francesco Giudici <[email protected]>
Older resources may not have annotations yet: initialize the field. Fixes: rancher#767 Signed-off-by: Francesco Giudici <[email protected]>
fgiudici
added a commit
to fgiudici/elemental-operator
that referenced
this pull request
Jun 20, 2024
* operator: fix ManagedOSVersionChannel sync After the very fist initial sync, all subsequently channel syncs fail. Fixed. fixes: rancher#766 * operator: don't assume ManagedOSVersion resources have annotations Older resources may not have annotations yet: initialize the field. Fixes: rancher#767 --------- Signed-off-by: Francesco Giudici <[email protected]> (cherry picked from commit 5ccde14)
fgiudici
added a commit
that referenced
this pull request
Jun 20, 2024
* operator: fix ManagedOSVersionChannel sync (#769) * operator: fix ManagedOSVersionChannel sync After the very fist initial sync, all subsequently channel syncs fail. Fixed. fixes: #766 * operator: don't assume ManagedOSVersion resources have annotations Older resources may not have annotations yet: initialize the field. Fixes: #767 (cherry picked from commit 5ccde14) * operator: always update managedosversionchannel last sync time (#772) ...also if we have an error on Pod creation. Fixes commit 5ccde14 (cherry picked from commit 7227947) Signed-off-by: Francesco Giudici <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Review the sync in the ManagedOSVersionChannel reconcile loop.
After the very fist initial sync, all subsequently channel syncs fail: fixed.
Fixes: #766
Older resources may not have annotations yet: initialize the field.
Fixes: #767