Skip to content

Commit ae1c5b5

Browse files
committed
fix: before start
1 parent 4d85b57 commit ae1c5b5

File tree

3 files changed

+45
-0
lines changed

3 files changed

+45
-0
lines changed

dist/chart/templates/lxcfs/daemon.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@ spec:
3030
tolerations:
3131
{{- toYaml . | nindent 8 }}
3232
{{- end }}
33+
initContainers:
34+
- command:
35+
- /bin/bash
36+
- -c
37+
- nsenter -m/proc/1/ns/mnt fusermount -u /var/lib/lxc/lxcfs 2> /dev/null ||
38+
true
39+
image: {{ .Values.lxcfs.daemonSet.image.repository }}:{{ .Values.lxcfs.daemonSet.image.tag }}
40+
imagePullPolicy: IfNotPresent
41+
name: cleanup-lxcfs-mount
42+
resources: {}
43+
securityContext:
44+
privileged: true
45+
terminationMessagePath: /dev/termination-log
46+
terminationMessagePolicy: File
47+
volumeMounts:
48+
- mountPath: /var/lib/lxc
49+
name: lxc-folder
3350
containers:
3451
- name: lxcfs
3552
image: {{ .Values.lxcfs.daemonSet.image.repository }}:{{ .Values.lxcfs.daemonSet.image.tag }}
@@ -114,6 +131,10 @@ spec:
114131
hostPath:
115132
path: /var/lib/lxc/lxcfs
116133
type: DirectoryOrCreate
134+
- hostPath:
135+
path: /var/lib/lxc
136+
type: DirectoryOrCreate
137+
name: lxc-folder
117138
{{- if .Values.lxcfs.daemonSet.lifecycle.postStart.enable }}
118139
- name: datalog
119140
hostPath:

dist/chart/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ lxcfs:
44
image:
55
repository: docker.io/liyiloong/lxcfs
66
tag: v6.0.4-ubuntu22.04
7+
# repository: gpu-harbor.act.buaa.edu.cn/user-liyilong/ubuntu
8+
# tag: 05061356-8213
79
resources:
810
limits:
911
cpu: 200m
@@ -40,6 +42,7 @@ controllerManager:
4042
container:
4143
image:
4244
repository: docker.io/liyiloong/lxcfs-webhook
45+
# repository: crater-harbor.act.buaa.edu.cn/crater/lxcfs-webhook
4346
tag: v0.1
4447
args:
4548
- "--leader-elect"

lxcfs/lxcfs-daemonset.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,23 @@ spec:
170170
- name: start-script
171171
mountPath: /start.sh
172172
subPath: start.sh
173+
initContainers:
174+
- command:
175+
- /bin/bash
176+
- -c
177+
- nsenter -m/proc/1/ns/mnt fusermount -u /var/lib/lxc/lxcfs 2> /dev/null ||
178+
true
179+
image: gpu-harbor.act.buaa.edu.cn/user-liyilong/ubuntu:05061356-8213
180+
imagePullPolicy: IfNotPresent
181+
name: cleanup-lxcfs-mount
182+
resources: {}
183+
securityContext:
184+
privileged: true
185+
terminationMessagePath: /dev/termination-log
186+
terminationMessagePolicy: File
187+
volumeMounts:
188+
- mountPath: /var/lib/lxc
189+
name: lxc-folder
173190
volumes:
174191
- name: cgroup
175192
hostPath:
@@ -184,6 +201,10 @@ spec:
184201
hostPath:
185202
path: /var/lib/lxc/lxcfs
186203
type: DirectoryOrCreate
204+
- hostPath:
205+
path: /var/lib/lxc
206+
type: DirectoryOrCreate
207+
name: lxc-folder
187208
- name: datalog
188209
hostPath:
189210
path: /tmp/lxcfs

0 commit comments

Comments
 (0)