Mask docker.service to prevent socket activation

* Kubelet now uses `containerd` as the container runtime, but
`docker.service` still starts when `docker.sock` is probed bc
the service is socket activated. Prevent this by masking the
`docker.service` unit
This commit is contained in:
Dalton Hubble 2022-01-14 10:10:32 -08:00
parent 2e8bc99164
commit 08ea9776f3
11 changed files with 22 additions and 1 deletions

View File

@ -7,12 +7,13 @@ Notable changes between versions.
### Fedora CoreOS ### Fedora CoreOS
* Switch Kubernetes Container Runtime from `docker` to `containerd` ([#1101](https://github.com/poseidon/typhoon/pull/1101)) * Switch Kubernetes Container Runtime from `docker` to `containerd` ([#1101](https://github.com/poseidon/typhoon/pull/1101))
* Mask `docker.service` to prevent it from being socket activated ([#1105](https://github.com/poseidon/typhoon/pull/1105))
### Flatcar Linux ### Flatcar Linux
#### AWS #### AWS
* Add experimental Flatcar Linux ARM64 support ([#1102](https://github.com/poseidon/typhoon/pull/1102)) * Add experimental Flatcar Linux ARM64 support ([docs](https://typhoon.psdn.io/advanced/arm64/), [#1102](https://github.com/poseidon/typhoon/pull/1102))
* Add `arch` variable to AWS `kubernetes` and `workers` modules * Add `arch` variable to AWS `kubernetes` and `workers` modules
* Allow arm64 full-cluster or mixed/hybrid cluster with arm64 workers * Allow arm64 full-cluster or mixed/hybrid cluster with arm64 workers
* Requires `flannel` or `cilium` CNI provider * Requires `flannel` or `cilium` CNI provider

View File

@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target WantedBy=multi-user.target
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -5,6 +5,8 @@ systemd:
units: units:
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target WantedBy=multi-user.target
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -5,6 +5,8 @@ systemd:
units: units:
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target WantedBy=multi-user.target
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -5,6 +5,8 @@ systemd:
units: units:
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target WantedBy=multi-user.target
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -5,6 +5,8 @@ systemd:
units: units:
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target WantedBy=multi-user.target
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |

View File

@ -5,6 +5,8 @@ systemd:
units: units:
- name: containerd.service - name: containerd.service
enabled: true enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service - name: wait-for-dns.service
enabled: true enabled: true
contents: | contents: |