Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CNTRLPLANE-25: Fix valid release image update issue #5316

Merged
merged 2 commits into from
Dec 19, 2024
+11 −6
Merged

CNTRLPLANE-25: Fix valid release image update issue #5316

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c125ab
Fix spelling mistakes found in codespell
bryan-cox Dec 18, 2024
92a0917
Get HCP before Valid Release Image status patch
bryan-cox Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Get HCP before Valid Release Image status patch 
This commit gets the latest HCP into memory before we update the Valid
Release Image status.

Signed-off-by: Bryan Cox <brcox@redhat.com>
  • Loading branch information
@bryan-cox
bryan-cox committed Dec 18, 2024
commit 92a09173f5c2a7e163692f70c22b92580c9d6f18
5 changes: 5 additions & 0 deletions control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,11 @@ func (r *HostedControlPlaneReconciler) update(ctx context.Context, hostedControl
}
}

// Get the latest HCP in memory before we patch the status
if err = r.Client.Get(ctx, client.ObjectKeyFromObject(hostedControlPlane), hostedControlPlane); err != nil {
return reconcile.Result{}, err
}

originalHostedControlPlane := hostedControlPlane.DeepCopy()
missingImages := sets.New(releaseImageProvider.GetMissingImages()...).Insert(userReleaseImageProvider.GetMissingImages()...)
if missingImages.Len() == 0 {
Expand Down