Merge "Add support of containerd"
diff --git a/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml b/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml
index 51657a8..b6688c1 100644
--- a/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml
+++ b/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml
@@ -104,6 +104,12 @@
key: cpu-model
name: virtlet-config
optional: true
+ - name: KUBELET_ROOT_DIR
+ valueFrom:
+ configMapKeyRef:
+ name: virtlet-config
+ key: kubelet_root_dir
+ optional: true
- name: VIRTLET_IMAGE_TRANSLATIONS_DIR
value: /etc/virtlet/images
image: {{ common.addons.virtlet.image }}
@@ -193,6 +199,7 @@
readOnly: true
- mountPath: /var/lib/virtlet
name: virtlet
+ mountPropagation: Bidirectional
- mountPath: /var/lib/libvirt
name: libvirt
- mountPath: /var/run/libvirt
@@ -220,10 +227,14 @@
volumeMounts:
- mountPath: /var/lib/virtlet
name: virtlet
+ mountPropagation: HostToContainer
- mountPath: /var/lib/libvirt
name: libvirt
- mountPath: /var/log/vms
name: vms-log
+ - mountPath: /var/lib/kubelet/pods
+ name: k8s-pods-dir
+ mountPropagation: HostToContainer
- mountPath: /dev
name: dev
- mountPath: /lib/modules
@@ -282,11 +293,6 @@
name: virtlet-image-translations
name: image-name-translations
updateStrategy: {}
-status:
- currentNumberScheduled: 0
- desiredNumberScheduled: 0
- numberMisscheduled: 0
- numberReady: 0
---
apiVersion: rbac.authorization.k8s.io/v1beta1
@@ -464,11 +470,6 @@
singular: virtletimagemapping
scope: Namespaced
version: v1
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: null
---
apiVersion: apiextensions.k8s.io/v1beta1
@@ -544,11 +545,6 @@
priority:
type: integer
version: v1
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: null
---
apiVersion: v1