Skip to content

Commit 46d7ffc

Browse files
author
Ian Campbell
committed
Use more readable/comparable/compact syntax for mount options
Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 91797e3 commit 46d7ffc

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

pkg/cri-containerd/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ config:
1717
- /var/lib/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rshared,rbind
1818
mounts:
1919
- type: cgroup
20-
options:
21-
- rw
22-
- nosuid
23-
- noexec
24-
- nodev
25-
- relatime
20+
options: ["rw","nosuid","noexec","nodev","relatime"]
2621
capabilities:
2722
- all
2823
rootfsPropagation: shared

pkg/kubelet/build.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@ config:
1818
- /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
1919
mounts:
2020
- type: cgroup
21-
options:
22-
- rw
23-
- nosuid
24-
- noexec
25-
- nodev
26-
- relatime
21+
options: ["rw","nosuid","noexec","nodev","relatime"]
2722
capabilities:
2823
- all
2924
rootfsPropagation: shared
@@ -38,12 +33,8 @@ config:
3833
- type: bind
3934
source: /var/lib/cni/bin
4035
destination: /opt/cni/bin
41-
options:
42-
- rw
43-
- bind
36+
options: ["rw","bind"]
4437
- type: bind
4538
source: /var/lib/cni/conf
4639
destination: /etc/cni/net.d
47-
options:
48-
- rw
49-
- bind
40+
options: ["rw","bind"]

0 commit comments

Comments
 (0)