Revert "OCPBUGS-4038: bootstrap: Skip gatewayd units only on OKD agent-installer"

LorbusChris · LorbusChris · commit 024386d953e6 · 2023-10-30T22:36:19.000+01:00
This reverts commit ff2ed87.
diff --git a/pkg/asset/ignition/bootstrap/common.go b/pkg/asset/ignition/bootstrap/common.go
@@ -181,7 +181,7 @@ func (a *Common) generateConfig(dependencies asset.Parents, templateData *bootst
 	if err := AddSystemdUnits(a.Config, "bootstrap/systemd/common/units", templateData, commonEnabledServices); err != nil {
 		return err
 	}
-	if !(templateData.IsOKD && templateData.Invoker == "agent-installer") {
+	if !templateData.IsOKD {
 		if err := AddSystemdUnits(a.Config, "bootstrap/systemd/rhcos/units", templateData, rhcosEnabledServices); err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ func (a Common) generateConfig(dependencies asset.Parents, templateData bootst`
`181`	`181`	`if err := AddSystemdUnits(a.Config, "bootstrap/systemd/common/units", templateData, commonEnabledServices); err != nil {`
`182`	`182`	`return err`
`183`	`183`	`}`
`184`		`- if !(templateData.IsOKD && templateData.Invoker == "agent-installer") {`
	`184`	`+ if !templateData.IsOKD {`
`185`	`185`	`if err := AddSystemdUnits(a.Config, "bootstrap/systemd/rhcos/units", templateData, rhcosEnabledServices); err != nil {`
`186`	`186`	`return err`
`187`	`187`	`}`