Skip to content

Commit 54ab8ab

Browse files
authored andcommitted
Add kubelet system-container ADDLT_MOUNTS
This commit allows kubelet system-containers to accept additional mounts during creation. This implements the same interface as the etcd system container: https://github.com/projectatomic/atomic-system-containers/blob/master/etcd/config.json.template#L219 Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch> Closes: #163 Approved by: giuseppe
1 parent 2d50826 commit 54ab8ab

File tree

Image for: File tree

3 files changed

Image for: 3 files changed
+8
-1
lines changed

3 files changed

Image for: 3 files changed
+8
-1
lines changed

‎kubernetes-kubelet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LABEL RUN /usr/bin/docker run -d --privileged --net=host --pid=host -v /:/rootfs
1818

1919
COPY launch.sh /usr/bin/kubelet-docker.sh
2020

21-
COPY tmpfiles.template service.template config.json.template /exports/
21+
COPY manifest.json tmpfiles.template service.template config.json.template /exports/
2222

2323
RUN mkdir -p /exports/hostfs/etc/cni/net.d && \
2424
mkdir -p /exports/hostfs/etc/kubernetes && \

‎kubernetes-kubelet/config.json.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@
392392
"size=65536k"
393393
]
394394
}
395+
$ADDTL_MOUNTS
395396
],
396397
"linux": {
397398
"rootfsPropagation": "rslave",

‎kubernetes-kubelet/manifest.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "1.0",
3+
"defaultValues": {
4+
"ADDTL_MOUNTS": ""
5+
}
6+
}

0 commit comments

Image for: 0 commit comments
Comments
 (0)