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

Commit 8edb018

Browse files
aaronlevyaaronlevy
authored
Merge pull request #73 from aaronlevy/mnt-rkt
pkg/asset: mount /var/lib/rkt in kubelet container
2 parents 39c13b1 + c6c10c7 commit 8edb018

File tree

2 files changed

+68
-49
lines changed

2 files changed

+68
-49
lines changed

‎pkg/asset/internal/templates.go‎

Lines changed: 63 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -208,62 +208,76 @@ var (
208208
0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x50,
209209
0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f,
210210
0x6c, 0x69, 0x62, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65,
211-
0x74, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f,
212-
0x73, 0x74, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x3a,
213-
0x20, 0x74, 0x72, 0x75, 0x65, 0xa, 0x20, 0x20, 0x20, 0x20,
214-
0x20, 0x20, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x49, 0x44, 0x3a,
215-
0x20, 0x74, 0x72, 0x75, 0x65, 0xa, 0x20, 0x20, 0x20, 0x20,
216-
0x20, 0x20, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x73, 0x3a,
217-
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e,
218-
0x61, 0x6d, 0x65, 0x3a, 0x20, 0x64, 0x65, 0x76, 0xa, 0x20,
219-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73,
220-
0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20,
221-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74,
222-
0x68, 0x3a, 0x20, 0x2f, 0x64, 0x65, 0x76, 0xa, 0x20, 0x20,
223-
0x20, 0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e, 0x61, 0x6d, 0x65,
224-
0x3a, 0x20, 0x72, 0x75, 0x6e, 0xa, 0x20, 0x20, 0x20, 0x20,
225-
0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x61,
226-
0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
227-
0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74, 0x68, 0x3a, 0x20,
228-
0x2f, 0x72, 0x75, 0x6e, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20,
229-
0x20, 0x2d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x73,
230-
0x79, 0x73, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
211+
0x74, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
212+
0x2d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x76, 0x61,
213+
0x72, 0x2d, 0x6c, 0x69, 0x62, 0x2d, 0x72, 0x6b, 0x74, 0xa,
214+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
215+
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x61, 0x74, 0x68, 0x3a,
216+
0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f, 0x6c, 0x69, 0x62, 0x2f,
217+
0x72, 0x6b, 0x74, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
218+
0x68, 0x6f, 0x73, 0x74, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72,
219+
0x6b, 0x3a, 0x20, 0x74, 0x72, 0x75, 0x65, 0xa, 0x20, 0x20,
220+
0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x49,
221+
0x44, 0x3a, 0x20, 0x74, 0x72, 0x75, 0x65, 0xa, 0x20, 0x20,
222+
0x20, 0x20, 0x20, 0x20, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65,
223+
0x73, 0x3a, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d,
224+
0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x64, 0x65, 0x76,
225+
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
226+
0x6f, 0x73, 0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20,
227+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70,
228+
0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x64, 0x65, 0x76, 0xa,
229+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e, 0x61,
230+
0x6d, 0x65, 0x3a, 0x20, 0x72, 0x75, 0x6e, 0xa, 0x20, 0x20,
231+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73, 0x74,
232+
0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20, 0x20,
233+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74, 0x68,
234+
0x3a, 0x20, 0x2f, 0x72, 0x75, 0x6e, 0xa, 0x20, 0x20, 0x20,
235+
0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3a,
236+
0x20, 0x73, 0x79, 0x73, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20,
237+
0x20, 0x20, 0x20, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x61, 0x74,
238+
0x68, 0x3a, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
239+
0x20, 0x20, 0x20, 0x70, 0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f,
240+
0x73, 0x79, 0x73, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
241+
0x2d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x65, 0x74,
242+
0x63, 0x2d, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
243+
0x65, 0x73, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
231244
0x20, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x61, 0x74, 0x68, 0x3a,
232245
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
233-
0x20, 0x70, 0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x73, 0x79,
246+
0x20, 0x70, 0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x65, 0x74,
247+
0x63, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
248+
0x65, 0x73, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d,
249+
0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x65, 0x74, 0x63,
250+
0x2d, 0x73, 0x73, 0x6c, 0x2d, 0x63, 0x65, 0x72, 0x74, 0x73,
251+
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
252+
0x6f, 0x73, 0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20,
253+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70,
254+
0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f,
255+
0x73, 0x68, 0x61, 0x72, 0x65, 0x2f, 0x63, 0x61, 0x2d, 0x63,
256+
0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
234257
0x73, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20,
235-
0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x65, 0x74, 0x63, 0x2d,
236-
0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73,
258+
0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x76, 0x61, 0x72, 0x2d,
259+
0x6c, 0x69, 0x62, 0x2d, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72,
237260
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
238261
0x6f, 0x73, 0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20,
239262
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70,
240-
0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x65, 0x74, 0x63, 0x2f,
241-
0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73,
263+
0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f,
264+
0x6c, 0x69, 0x62, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72,
242265
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e,
243-
0x61, 0x6d, 0x65, 0x3a, 0x20, 0x65, 0x74, 0x63, 0x2d, 0x73,
244-
0x73, 0x6c, 0x2d, 0x63, 0x65, 0x72, 0x74, 0x73, 0xa, 0x20,
245-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73,
246-
0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20,
247-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74,
248-
0x68, 0x3a, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68,
249-
0x61, 0x72, 0x65, 0x2f, 0x63, 0x61, 0x2d, 0x63, 0x65, 0x72,
250-
0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0xa,
251-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e, 0x61,
252-
0x6d, 0x65, 0x3a, 0x20, 0x76, 0x61, 0x72, 0x2d, 0x6c, 0x69,
253-
0x62, 0x2d, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0xa, 0x20,
254-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73,
255-
0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20,
256-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74,
257-
0x68, 0x3a, 0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f, 0x6c, 0x69,
258-
0x62, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0xa, 0x20,
259-
0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20, 0x6e, 0x61, 0x6d,
260-
0x65, 0x3a, 0x20, 0x76, 0x61, 0x72, 0x2d, 0x6c, 0x69, 0x62,
261-
0x2d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0xa, 0x20,
262-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73,
263-
0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20,
264-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74,
265-
0x68, 0x3a, 0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f, 0x6c, 0x69,
266-
0x62, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0xa,
266+
0x61, 0x6d, 0x65, 0x3a, 0x20, 0x76, 0x61, 0x72, 0x2d, 0x6c,
267+
0x69, 0x62, 0x2d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74,
268+
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
269+
0x6f, 0x73, 0x74, 0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20,
270+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70,
271+
0x61, 0x74, 0x68, 0x3a, 0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f,
272+
0x6c, 0x69, 0x62, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65,
273+
0x74, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x20,
274+
0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x20, 0x76, 0x61, 0x72, 0x2d,
275+
0x6c, 0x69, 0x62, 0x2d, 0x72, 0x6b, 0x74, 0xa, 0x20, 0x20,
276+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x73, 0x74,
277+
0x50, 0x61, 0x74, 0x68, 0x3a, 0xa, 0x20, 0x20, 0x20, 0x20,
278+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x74, 0x68,
279+
0x3a, 0x20, 0x2f, 0x76, 0x61, 0x72, 0x2f, 0x6c, 0x69, 0x62,
280+
0x2f, 0x72, 0x6b, 0x74, 0xa,
267281
}
268282
_APIServerTemplate = []byte{
269283
0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,

‎pkg/asset/templates/kubelet.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
mountPath: /var/lib/docker
5959
- name: var-lib-kubelet
6060
mountPath: /var/lib/kubelet
61+
- name: var-lib-rkt
62+
mountPath: /var/lib/rkt
6163
hostNetwork: true
6264
hostPID: true
6365
volumes:
@@ -82,3 +84,6 @@ spec:
8284
- name: var-lib-kubelet
8385
hostPath:
8486
path: /var/lib/kubelet
87+
- name: var-lib-rkt
88+
hostPath:
89+
path: /var/lib/rkt

0 commit comments

Comments
 (0)