Skip to content

[release-4.14] OCPBUGS-22315: bootstrap: Enable gatewayd units only on RHCOS #7628

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

Merged
openshift-merge-bot merged 1 commit into from
Jan 18, 2024
Merged

[release-4.14] OCPBUGS-22315: bootstrap: Enable gatewayd units only on RHCOS #7628

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
0 ...otstrap/systemd/units/approve-csr.service → .../systemd/common/units/approve-csr.service
View file
Open in desktop
File renamed without changes.
0 .../bootstrap/systemd/units/bootkube.service → ...rap/systemd/common/units/bootkube.service
View file
Open in desktop
File renamed without changes.
0 ...emd/units/crio-configure.service.template → ...mon/units/crio-configure.service.template
View file
Open in desktop
File renamed without changes.
0 ...ap/systemd/units/kubelet.service.template → ...emd/common/units/kubelet.service.template
View file
Open in desktop
File renamed without changes.
0 .../bootstrap/systemd/units/progress.service → ...rap/systemd/common/units/progress.service
View file
Open in desktop
File renamed without changes.
0 ...nits/release-image-pivot.service.template → ...nits/release-image-pivot.service.template
View file
Open in desktop
File renamed without changes.
0 ...strap/systemd/units/release-image.service → ...ystemd/common/units/release-image.service
View file
Open in desktop
File renamed without changes.
0 ...emd-journal-gatewayd.service.d/certs.conf → ...emd-journal-gatewayd.service.d/certs.conf
View file
Open in desktop
File renamed without changes.
0 ...ti.service.d/okd-machine-os-disabled.conf → ...ti.service.d/okd-machine-os-disabled.conf
View file
Open in desktop
File renamed without changes.
0 .../systemd/units/chown-gatewayd-key.service → ...md/rhcos/units/chown-gatewayd-key.service
View file
Open in desktop
File renamed without changes.
0 ...emd/units/systemd-journal-gatewayd.socket → ...cos/units/systemd-journal-gatewayd.socket
View file
Open in desktop
File renamed without changes.
14 changes: 11 additions & 3 deletions pkg/asset/ignition/bootstrap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -173,9 +176,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()
Expand Down