Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

[v0.16.x] Disable Flatcare Updates #1909

Merged
merged 3 commits into from
Sep 23, 2020
+13 −22
Merged

[v0.16.x] Disable Flatcare Updates #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a1e598
Merge pull request #1905 from brandong954/v0.16.x (#6)
brandong954 Sep 22, 2020
4fc841f
fixes whitespacing in kubelet.service
Sep 22, 2020
e74ef96
disables auto updates for flatcar
Sep 22, 2020
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
11 changes: 4 additions & 7 deletions builtin/files/userdata/cloud-config-controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,10 @@ coreos:
reboot-strategy: "off"
units:
{{if .DisableContainerLinuxAutomaticUpdates}}
- name: disable-automatic-update.service
command: start
content: |
[Unit]
Description=Disable Container Linux automatic update. Work around to be removed on Ignition migration.
[Service]
ExecStart=/usr/bin/sh -c 'for u in update-engine locksmithd; do systemctl stop $${u}.service; systemctl mask $${u}.service; systemctl disable $${u}.service; done; systemctl reset-failed'
- name: update-engine.service
mask: true
- name: locksmithd.service
mask: true
{{end}}

- name: handle-disable-request.service
Expand Down
11 changes: 4 additions & 7 deletions builtin/files/userdata/cloud-config-etcd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,10 @@ coreos:
reboot-strategy: "off"
units:
{{if .DisableContainerLinuxAutomaticUpdates}}
- name: disable-automatic-update.service
command: start
content: |
[Unit]
Description=Disable Container Linux automatic update. Work around to be removed on Ignition migration.
[Service]
ExecStart=/usr/bin/sh -c 'for u in update-engine locksmithd; do systemctl stop $${u}.service; systemctl mask $${u}.service; systemctl disable $${u}.service; done; systemctl reset-failed'
- name: update-engine.service
mask: true
- name: locksmithd.service
mask: true
{{end}}
{{- range $u := .Etcd.CustomSystemdUnits}}
- name: {{$u.Name}}
Expand Down
13 changes: 5 additions & 8 deletions builtin/files/userdata/cloud-config-worker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,10 @@ coreos:
reboot-strategy: "off"
units:
{{if .DisableContainerLinuxAutomaticUpdates}}
- name: disable-automatic-update.service
command: start
content: |
[Unit]
Description=Disable Container Linux automatic update. Work around to be removed on Ignition migration.
[Service]
ExecStart=/usr/bin/sh -c 'for u in update-engine locksmithd; do systemctl stop $${u}.service; systemctl mask $${u}.service; systemctl disable $${u}.service; done; systemctl reset-failed'
- name: update-engine.service
mask: true
- name: locksmithd.service
mask: true
{{end}}
{{- range $u := .CustomSystemdUnits}}
- name: {{$u.Name}}
Expand Down Expand Up @@ -343,7 +340,7 @@ coreos:
-v /etc/kubernetes:/etc/kubernetes:rw \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \
-v /var/lib/docker:/var/lib/docker:rshared \
{{ if eq .ContainerRuntime "rkt" -}}
{{- if eq .ContainerRuntime "rkt" }}
-v /opt/bin/host-rkt:/opt/bin/host-rkt:rw \
-v /usr/bin/rkt:/usr/bin/rkt:ro \
-v /var/lib/rkt:/usr/lib/rkt:rw \
Expand Down