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

kola: Two zincati fixes #3650

Merged
merged 2 commits into from
Oct 23, 2023
Merged

kola: Two zincati fixes #3650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a5cfb6
kola: Use centralized drop-in to disable zincati
cgwalters Oct 22, 2023
aa3dabe
kola: Explicitly mask zincati
cgwalters Oct 22, 2023
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
5 changes: 3 additions & 2 deletions mantle/platform/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,7 @@ func (bc *BaseCluster) RenderUserData(userdata *platformConf.UserData, ignitionV

// disable Zincati by default
if bc.Distribution() == "fcos" {
conf.AddFile("/etc/zincati/config.d/90-disable-auto-updates.toml", `[updates]
enabled = false`, 0644)
conf.DisableAutomaticUpdates()
}

if bc.bf.baseopts.OSContainer != "" {
Expand All @@ -283,6 +282,8 @@ After=network-online.target

[Service]
Type=oneshot
# Newer zincati more explicitly fails on containers; fully disable it
ExecStart=systemctl mask --now zincati
ExecStart=rpm-ostree rebase --experimental %s
ExecStart=touch /etc/kola-rebase-done
ExecStart=systemctl reboot
Expand Down
Loading