From f9930f9b0b9404bf2faa9dc736441800bb07f179 Mon Sep 17 00:00:00 2001
From: Joseph Marrero <jmarrero@redhat.com>
Date: Mon, 11 Jul 2022 10:48:25 -0400
Subject: [PATCH] Bug 2104619: Remove rollback deployment #3243

This reverts commit 25a7812ab544884d73f9ec3fd63c6dde16909bb8.
to provide a fix to:
https://bugzilla.redhat.com/show_bug.cgi?id=2104619
---
 pkg/daemon/daemon.go |  4 ++++
 pkg/daemon/update.go | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
index 432737098f..d5708ac77c 100644
--- a/pkg/daemon/daemon.go
+++ b/pkg/daemon/daemon.go
@@ -1400,6 +1400,10 @@ func (dn *Daemon) checkStateOnFirstRun() error {
 		return fmt.Errorf("error detecting previous SSH accesses: %w", err)
 	}
 
+	if err := dn.removeRollback(); err != nil {
+		return fmt.Errorf("Failed to remove rollback: %w", err)
+	}
+
 	// Bootstrapping state is when we have the node annotations file
 	if state.bootstrapping {
 		targetOSImageURL := state.currentConfig.Spec.OSImageURL
diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go
index 2618304126..2e38e44beb 100644
--- a/pkg/daemon/update.go
+++ b/pkg/daemon/update.go
@@ -689,6 +689,20 @@ func (dn *Daemon) updateHypershift(oldConfig, newConfig *mcfgv1.MachineConfig, d
 	return nil
 }
 
+// removeRollback removes the rpm-ostree rollback deployment.
+// It takes up space and can cause issues when /boot contains multiple
+// initramfs images: https://bugzilla.redhat.com/show_bug.cgi?id=2104619.
+// We don't generally expect administrators to use this versus e.g. removing
+// broken configuration. We only remove the rollback once the MCD pod has
+// landed on a node, so we know kubelet is working.
+func (dn *Daemon) removeRollback() error {
+	if !dn.os.IsCoreOSVariant() {
+		// do not attempt to rollback on non-RHCOS/FCOS machines
+		return nil
+	}
+	return runRpmOstree("cleanup", "-r")
+}
+
 // machineConfigDiff represents an ad-hoc difference between two MachineConfig objects.
 // At some point this may change into holding just the files/units that changed
 // and the MCO would just operate on that.  For now we're just doing this to get