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

restart containerd for flatcar so the drop in conf will be considered #1476

Merged
merged 2 commits into from
Nov 7, 2022
Merged

restart containerd for flatcar so the drop in conf will be considered #1476

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
b2c8b6f
restart containerd for flatcar so the drop in conf will be considered
lucakuendig Nov 4, 2022
b90dc29
update fixture data
lucakuendig Nov 4, 2022
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
2 changes: 1 addition & 1 deletion pkg/containerruntime/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/container
EOF

systemctl daemon-reload
systemctl enable --now containerd
systemctl restart containerd
`))

containerdAmzn2Template = template.Must(template.New("containerd-yum-amzn2").Parse(`
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/flatcar/testdata/cloud-init_v1.24.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ write_files:
EOF

systemctl daemon-reload
systemctl enable --now containerd
systemctl restart containerd

systemctl disable download-script.service

Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/flatcar/testdata/cloud-init_v1.25.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ write_files:
EOF

systemctl daemon-reload
systemctl enable --now containerd
systemctl restart containerd

systemctl disable download-script.service

Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/flatcar/testdata/containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ write_files:
EOF

systemctl daemon-reload
systemctl enable --now containerd
systemctl restart containerd

systemctl disable download-script.service

Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/flatcar/testdata/ignition_v1.24.0.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/userdata/flatcar/testdata/ignition_v1.25.0.json
View file
Open in desktop

Large diffs are not rendered by default.