Skip to content

OCPBUGS-62479: Skip local storage rebase during OCL revert #5686

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

Open
ptalgulk01 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-62479: Skip local storage rebase during OCL revert #5686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,7 +2210,7 @@ func (dn *Daemon) checkStateOnFirstRun() error {
if !osMatch {
logSystem("Bootstrap pivot required to: %s", targetOSImageURL)

if err := dn.updateLayeredOS(state.currentConfig); err != nil {
if err := dn.updateLayeredOS(state.currentConfig, false); err != nil {
return err
}

Expand Down
12 changes: 8 additions & 4 deletions pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2616,7 +2616,7 @@ func (dn *Daemon) queueRevertKernelSwap() error {
}

// updateLayeredOS updates the system OS to the one specified in newConfig
func (dn *Daemon) updateLayeredOS(config *mcfgv1.MachineConfig) error {
func (dn *Daemon) updateLayeredOS(config *mcfgv1.MachineConfig, isRevertingFromOCL bool) error {
newURL := config.Spec.OSImageURL
klog.Infof("Updating OS to layered image %q", newURL)

Expand All @@ -2639,12 +2639,16 @@ func (dn *Daemon) updateLayeredOS(config *mcfgv1.MachineConfig) error {
}

// If PIS is configured check if the image is locally present. If so, rebase using
// the local image
// the local image.
// IMPORTANT: Skip local storage rebase when reverting from OCL to avoid using stale
// IRI certificates. See OCPBUGS-62479.
var podmanImageInfo *PodmanImageInfo
if isPisConfigured {
if isPisConfigured && !isRevertingFromOCL {
if podmanImageInfo, err = dn.podmanInterface.GetPodmanImageInfoByReference(newURL); err != nil {
return err
}
} else if isRevertingFromOCL {
klog.Info("Skipping local storage rebase during OCL revert to avoid certificate issues")
}

// For image mode status reporting we need the node's MCP association to populate its MCN
Expand Down Expand Up @@ -3020,7 +3024,7 @@ func (dn *CoreOSDaemon) applyLayeredOSChanges(mcDiff machineConfigDiff, oldConfi

// Update OS
if mcDiff.osUpdate {
if err := dn.updateLayeredOS(newConfig); err != nil {
if err := dn.updateLayeredOS(newConfig, mcDiff.revertFromOCL); err != nil {
mcdPivotErr.Inc()
return err
}
Expand Down