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

Jump to bottom

[fcos] disable zincati on masters/workers #1890

Merged
merged 2 commits into from
Jul 1, 2020
Merged

[fcos] disable zincati on masters/workers #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8a5e55
templates/common/_base/files: disable Zincati
vrutkovs Jul 1, 2020
8b3a4eb
templates/common/_base/units/machine-config-daemon-: run pivot before…
vrutkovs Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions templates/common/_base/files/etc-zincati-configd-90-disable-feature.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mode: 0755
path: "/etc/zincati/config.d/90-disable-feature.toml"
contents:
inline: |
[updates]
enabled = false
1 change: 1 addition & 0 deletions templates/common/_base/units/machine-config-daemon-firstboot.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ contents: |
After=machine-config-daemon-pull.service
Before=crio.service crio-wipe.service
Before=kubelet.service
Before=zincati.service

[Service]
# Need oneshot to delay kubelet
Expand Down
1 change: 1 addition & 0 deletions templates/common/_base/units/machine-config-daemon-host.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ contents: |
ConditionPathExists=!/usr/lib/systemd/system/pivot.service
After=ignition-firstboot-complete.service
Before=kubelet.service
Before=zincati.service

[Service]
# Need oneshot to delay kubelet
Expand Down
1 change: 1 addition & 0 deletions templates/common/_base/units/machine-config-daemon-pull.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ contents: |
ConditionPathExists=!/usr/libexec/bin/machine-config-daemon
After=ignition-firstboot-complete.service
Before=machine-config-daemon-host.service
Before=zincati.service

[Service]
# Need oneshot to delay kubelet
Expand Down