Skip to content

Commit

Permalink
Merge pull request #729 from yanxuean/mountlack
Browse files Browse the repository at this point in the history
mount entry lack when create and delete virtlet
  • Loading branch information
ivan4th authored Aug 24, 2018
2 parents df690f2 + 8f5b0cf commit dd19b60
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 14 deletions.
12 changes: 9 additions & 3 deletions deploy/data/virtlet-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
- name: k8s-flexvolume-plugins-dir
mountPath: /kubelet-volume-plugins
- name: run
mountPropagation: Bidirectional
# Don't add "mountPropagation: Bidirectional", it will lack mount entry
mountPath: /run
- name: dockersock
mountPath: /var/run/docker.sock
Expand Down Expand Up @@ -141,8 +141,8 @@ spec:
name: boot
readOnly: true
- mountPath: /run
# Don't add "mountPropagation: Bidirectional", it will lack mount entry
name: run
mountPropagation: Bidirectional
- mountPath: /var/lib/virtlet
name: virtlet
- mountPath: /var/lib/libvirt
Expand Down Expand Up @@ -172,8 +172,8 @@ spec:
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /run
# Don't add "mountPropagation: Bidirectional", it will lack mount entry
name: run
mountPropagation: Bidirectional
# /boot and /lib/modules are required by supermin
- mountPath: /lib/modules
name: modules
Expand Down Expand Up @@ -203,6 +203,9 @@ spec:
# needed for diagnostic purposes
- name: libvirt-log
mountPath: /var/log/libvirt
- name: netns-dir
mountPath: /var/run/netns
mountPropagation: Bidirectional
securityContext:
privileged: true
readinessProbe:
Expand Down Expand Up @@ -280,6 +283,9 @@ spec:
- hostPath:
path: /var/log/pods
name: pods-log
- hostPath:
path: /var/run/netns
name: netns-dir
- configMap:
name: virtlet-image-translations
name: image-name-translations
Expand Down
6 changes: 6 additions & 0 deletions pkg/tools/TestGenCommand__compat.out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ spec:
name: pods-log
- mountPath: /var/log/libvirt
name: libvirt-log
- mountPath: /var/run/netns
mountPropagation: Bidirectional
name: netns-dir
- command:
- /vms.sh
image: mirantis/virtlet
Expand Down Expand Up @@ -260,6 +263,9 @@ spec:
- hostPath:
path: /var/log/pods
name: pods-log
- hostPath:
path: /var/run/netns
name: netns-dir
- configMap:
name: virtlet-image-translations
name: image-name-translations
Expand Down
6 changes: 6 additions & 0 deletions pkg/tools/TestGenCommand__compat_dev.out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ spec:
name: pods-log
- mountPath: /var/log/libvirt
name: libvirt-log
- mountPath: /var/run/netns
mountPropagation: Bidirectional
name: netns-dir
- mountPath: /dind
name: dind
- command:
Expand Down Expand Up @@ -268,6 +271,9 @@ spec:
- hostPath:
path: /var/log/pods
name: pods-log
- hostPath:
path: /var/run/netns
name: netns-dir
- configMap:
name: virtlet-image-translations
name: image-name-translations
Expand Down
9 changes: 6 additions & 3 deletions pkg/tools/TestGenCommand__dev.out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ spec:
name: boot
readOnly: true
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /var/lib/virtlet
name: virtlet
Expand Down Expand Up @@ -80,7 +79,6 @@ spec:
privileged: true
volumeMounts:
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /lib/modules
name: modules
Expand Down Expand Up @@ -109,6 +107,9 @@ spec:
name: pods-log
- mountPath: /var/log/libvirt
name: libvirt-log
- mountPath: /var/run/netns
mountPropagation: Bidirectional
name: netns-dir
- mountPath: /dind
name: dind
- command:
Expand Down Expand Up @@ -208,7 +209,6 @@ spec:
- mountPath: /kubelet-volume-plugins
name: k8s-flexvolume-plugins-dir
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /var/run/docker.sock
name: dockersock
Expand Down Expand Up @@ -272,6 +272,9 @@ spec:
- hostPath:
path: /var/log/pods
name: pods-log
- hostPath:
path: /var/run/netns
name: netns-dir
- configMap:
name: virtlet-image-translations
name: image-name-translations
Expand Down
9 changes: 6 additions & 3 deletions pkg/tools/TestGenCommand__plain.out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ spec:
name: boot
readOnly: true
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /var/lib/virtlet
name: virtlet
Expand Down Expand Up @@ -78,7 +77,6 @@ spec:
privileged: true
volumeMounts:
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /lib/modules
name: modules
Expand Down Expand Up @@ -107,6 +105,9 @@ spec:
name: pods-log
- mountPath: /var/log/libvirt
name: libvirt-log
- mountPath: /var/run/netns
mountPropagation: Bidirectional
name: netns-dir
- command:
- /vms.sh
image: mirantis/virtlet
Expand Down Expand Up @@ -202,7 +203,6 @@ spec:
- mountPath: /kubelet-volume-plugins
name: k8s-flexvolume-plugins-dir
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /var/run/docker.sock
name: dockersock
Expand Down Expand Up @@ -264,6 +264,9 @@ spec:
- hostPath:
path: /var/log/pods
name: pods-log
- hostPath:
path: /var/run/netns
name: netns-dir
- configMap:
name: virtlet-image-translations
name: image-name-translations
Expand Down
9 changes: 6 additions & 3 deletions pkg/tools/TestGenCommand__tag.out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ spec:
name: boot
readOnly: true
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /var/lib/virtlet
name: virtlet
Expand Down Expand Up @@ -78,7 +77,6 @@ spec:
privileged: true
volumeMounts:
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /lib/modules
name: modules
Expand Down Expand Up @@ -107,6 +105,9 @@ spec:
name: pods-log
- mountPath: /var/log/libvirt
name: libvirt-log
- mountPath: /var/run/netns
mountPropagation: Bidirectional
name: netns-dir
- command:
- /vms.sh
image: mirantis/virtlet:0.9.42
Expand Down Expand Up @@ -202,7 +203,6 @@ spec:
- mountPath: /kubelet-volume-plugins
name: k8s-flexvolume-plugins-dir
- mountPath: /run
mountPropagation: Bidirectional
name: run
- mountPath: /var/run/docker.sock
name: dockersock
Expand Down Expand Up @@ -264,6 +264,9 @@ spec:
- hostPath:
path: /var/log/pods
name: pods-log
- hostPath:
path: /var/run/netns
name: netns-dir
- configMap:
name: virtlet-image-translations
name: image-name-translations
Expand Down
4 changes: 2 additions & 2 deletions pkg/tools/bindata.go

Large diffs are not rendered by default.

0 comments on commit dd19b60

Please sign in to comment.