Skip to content

Commit

Permalink
Mask docker.service to prevent socket activation
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dghubble committed Jan 14, 2022
1 parent 2e8bc99 commit 47ab299
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Notable changes between versions.
### Fedora CoreOS

* 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

### Flatcar Linux

Expand Down
2 changes: 2 additions & 0 deletions aws/fedora-coreos/kubernetes/fcc/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ systemd:
units:
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions azure/fedora-coreos/kubernetes/fcc/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ systemd:
units:
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ systemd:
units:
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ systemd:
units:
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ systemd:
WantedBy=multi-user.target
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down
2 changes: 2 additions & 0 deletions google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ systemd:
units:
- name: containerd.service
enabled: true
- name: docker.service
mask: true
- name: wait-for-dns.service
enabled: true
contents: |
Expand Down

0 comments on commit 47ab299

Please sign in to comment.