Merge pull request openshift#7580 from LorbusChris/bootstrap-services

OCPBUGS-4038: bootstrap: Enable gatewayd units only on RHCOS
JM1 · Oct 23, 2023 · bae6c39 · bae6c39
2 parents 04bfff5 + 84fbd99
commit bae6c39
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 3 deletions.
diff --git a/...otstrap/systemd/units/approve-csr.service → .../systemd/common/units/approve-csr.service b/...otstrap/systemd/units/approve-csr.service → .../systemd/common/units/approve-csr.service
diff --git a/.../bootstrap/systemd/units/bootkube.service → ...rap/systemd/common/units/bootkube.service b/.../bootstrap/systemd/units/bootkube.service → ...rap/systemd/common/units/bootkube.service
diff --git a/...emd/units/crio-configure.service.template → ...mon/units/crio-configure.service.template b/...emd/units/crio-configure.service.template → ...mon/units/crio-configure.service.template
diff --git a/...ap/systemd/units/kubelet.service.template → ...emd/common/units/kubelet.service.template b/...ap/systemd/units/kubelet.service.template → ...emd/common/units/kubelet.service.template
diff --git a/.../bootstrap/systemd/units/progress.service → ...rap/systemd/common/units/progress.service b/.../bootstrap/systemd/units/progress.service → ...rap/systemd/common/units/progress.service
diff --git a/...nits/release-image-pivot.service.template → ...nits/release-image-pivot.service.template b/...nits/release-image-pivot.service.template → ...nits/release-image-pivot.service.template
diff --git a/...strap/systemd/units/release-image.service → ...ystemd/common/units/release-image.service b/...strap/systemd/units/release-image.service → ...ystemd/common/units/release-image.service
diff --git a/...emd-journal-gatewayd.service.d/certs.conf → ...emd-journal-gatewayd.service.d/certs.conf b/...emd-journal-gatewayd.service.d/certs.conf → ...emd-journal-gatewayd.service.d/certs.conf
diff --git a/...ti.service.d/okd-machine-os-disabled.conf → ...ti.service.d/okd-machine-os-disabled.conf b/...ti.service.d/okd-machine-os-disabled.conf → ...ti.service.d/okd-machine-os-disabled.conf
diff --git a/.../systemd/units/chown-gatewayd-key.service → ...md/rhcos/units/chown-gatewayd-key.service b/.../systemd/units/chown-gatewayd-key.service → ...md/rhcos/units/chown-gatewayd-key.service
diff --git a/...emd/units/systemd-journal-gatewayd.socket → ...cos/units/systemd-journal-gatewayd.socket b/...emd/units/systemd-journal-gatewayd.socket → ...cos/units/systemd-journal-gatewayd.socket
diff --git a/pkg/asset/ignition/bootstrap/common.go b/pkg/asset/ignition/bootstrap/common.go
@@ -50,15 +50,18 @@ var (
 	commonEnabledServices = []string{
 		"progress.service",
 		"kubelet.service",
-		"chown-gatewayd-key.service",
-		"systemd-journal-gatewayd.socket",
 		"approve-csr.service",
 		// baremetal & openstack platform services
 		"keepalived.service",
 		"coredns.service",
 		"ironic.service",
 		"master-bmh-update.service",
 	}
+
+	rhcosEnabledServices = []string{
+		"chown-gatewayd-key.service",
+		"systemd-journal-gatewayd.socket",
+	}
 )
 
 // bootstrapTemplateData is the data to use to replace values in bootstrap
@@ -175,9 +178,14 @@ func (a *Common) generateConfig(dependencies asset.Parents, templateData *bootst
 	if err := AddStorageFiles(a.Config, "/", "bootstrap/files", templateData); err != nil {
 		return err
 	}
-	if err := AddSystemdUnits(a.Config, "bootstrap/systemd/units", templateData, commonEnabledServices); err != nil {
+	if err := AddSystemdUnits(a.Config, "bootstrap/systemd/common/units", templateData, commonEnabledServices); err != nil {
 		return err
 	}
+	if !templateData.IsOKD {
+		if err := AddSystemdUnits(a.Config, "bootstrap/systemd/rhcos/units", templateData, rhcosEnabledServices); err != nil {
+			return err
+		}
+	}
 
 	// Check for optional platform specific files/units
 	platform := installConfig.Config.Platform.Name()