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

Jump to bottom

[release-4.5] Bug 1846690: daemon: Remove encapsulated config when joining the cluster #1822

Merged
merged 1 commit into from
Jun 15, 2020
Merged

[release-4.5] Bug 1846690: daemon: Remove encapsulated config when joining the cluster #1822

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,24 @@ func (dn *Daemon) storeCurrentConfigOnDisk(current *mcfgv1.MachineConfig) error
return writeFileAtomicallyWithDefaults(dn.currentConfigPath, mcJSON)
}

// https://bugzilla.redhat.com/show_bug.cgi?id=1842906
// If we didn't successfully complete -firstboot.service, because
// 4.5 and newer removed the BindsTo=, the service may start downgrading
// things. At this point we should have already applied all target
// changes, so just rename the file to .bak the same as the -firstboot
// path does.
func upgradeHackFor44AndBelow() error {
_, err := os.Stat(constants.MachineConfigEncapsulatedPath)
if err == nil {
glog.Warningf("Failed to complete machine-config-daemon-firstboot before joining cluster!")
// Removing this file signals completion of the initial MC processing.
if err := os.Rename(constants.MachineConfigEncapsulatedPath, constants.MachineConfigEncapsulatedBakPath); err != nil {
return errors.Wrap(err, "failed to rename encapsulated MachineConfig after processing on firstboot")
}
}
return nil
}

// checkStateOnFirstRun is a core entrypoint for our state machine.
// It determines whether we're in our desired state, or if we're
// transitioning between states, and whether or not we need to update
Expand Down Expand Up @@ -940,7 +958,13 @@ func (dn *Daemon) checkStateOnFirstRun() error {
return fmt.Errorf("error detecting previous SSH accesses: %v", err)
}

// Bootstrapping state is when we have the node annotations file
if state.bootstrapping {
// Be sure only the MCD is running now, disable -firstboot.service
if err := upgradeHackFor44AndBelow(); err != nil {
return err
}

targetOSImageURL := state.currentConfig.Spec.OSImageURL
osMatch, err := dn.checkOS(targetOSImageURL)
if err != nil {
Expand Down