From d66877bb994396296438e2ba6e7032807f12f8c0 Mon Sep 17 00:00:00 2001 From: Piotr Skamruk Date: Thu, 4 Oct 2018 10:34:39 +0200 Subject: [PATCH] Make examples runnable in parallel Each examples (excluding k8s.yaml) have now own pod name, so they can be started in the same time. --- examples/README.md | 7 ++++--- examples/cirros-vm-persistent-rootfs-local.yaml | 2 +- examples/cirros-vm-persistent-rootfs-rbd.yaml | 2 +- examples/cirros-vm-raw-device.yaml | 2 +- examples/ubuntu-multi-cni.yaml | 2 +- examples/ubuntu-vm-local-block-pv.yaml | 2 +- examples/ubuntu-vm-rbd-block-pv.yaml | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/README.md b/examples/README.md index 79d5b7b91..98bddba3d 100644 --- a/examples/README.md +++ b/examples/README.md @@ -247,7 +247,7 @@ After the VM boots, we can log into it and create a file on the root filesystem: ```console -$ virtletctl ssh cirros@cirros-vm-p -- -i examples/vmkey +$ virtletctl ssh cirros@cirros-vm-pl -- -i examples/vmkey ... $ echo foo >bar.txt ``` @@ -261,7 +261,7 @@ kubectl apply -f examples/cirros-vm-persistent-rootfs-local.yaml After logging into the new VM pod, we see that the file is still there: ```console -$ virtletctl ssh cirros@cirros-vm-p -- -i examples/vmkey +$ virtletctl ssh cirros@cirros-vm-pl -- -i examples/vmkey ... $ cat bar.txt foo @@ -280,4 +280,5 @@ kubectl apply -f examples/cirros-vm-persistent-rootfs-rbd.yaml ``` After that, you can verify that the persistent rootfs indeed works -using the same approach as with local PVs. +using the same approach as with local PVs, but using name `cirros-vm-pr` +in place of `cirros-vm-pl`. diff --git a/examples/cirros-vm-persistent-rootfs-local.yaml b/examples/cirros-vm-persistent-rootfs-local.yaml index 5999956c7..218aa141d 100644 --- a/examples/cirros-vm-persistent-rootfs-local.yaml +++ b/examples/cirros-vm-persistent-rootfs-local.yaml @@ -43,7 +43,7 @@ spec: apiVersion: v1 kind: Pod metadata: - name: cirros-vm-p + name: cirros-vm-pl annotations: kubernetes.io/target-runtime: virtlet.cloud # CirrOS doesn't load nocloud data from SCSI CD-ROM for some reason diff --git a/examples/cirros-vm-persistent-rootfs-rbd.yaml b/examples/cirros-vm-persistent-rootfs-rbd.yaml index dbe169a18..890ef3ebb 100644 --- a/examples/cirros-vm-persistent-rootfs-rbd.yaml +++ b/examples/cirros-vm-persistent-rootfs-rbd.yaml @@ -36,7 +36,7 @@ spec: apiVersion: v1 kind: Pod metadata: - name: cirros-vm-p + name: cirros-vm-pr annotations: kubernetes.io/target-runtime: virtlet.cloud # CirrOS doesn't load nocloud data from SCSI CD-ROM for some reason diff --git a/examples/cirros-vm-raw-device.yaml b/examples/cirros-vm-raw-device.yaml index 79aa141fb..327e160a6 100644 --- a/examples/cirros-vm-raw-device.yaml +++ b/examples/cirros-vm-raw-device.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: cirros-vm + name: cirros-vm-raw-device annotations: kubernetes.io/target-runtime: virtlet.cloud spec: diff --git a/examples/ubuntu-multi-cni.yaml b/examples/ubuntu-multi-cni.yaml index 785510be9..42509f6ab 100644 --- a/examples/ubuntu-multi-cni.yaml +++ b/examples/ubuntu-multi-cni.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: ubuntu-vm + name: ubuntu-multi-cni annotations: multi-ip-preferences: | { diff --git a/examples/ubuntu-vm-local-block-pv.yaml b/examples/ubuntu-vm-local-block-pv.yaml index 33392852b..dbad53699 100644 --- a/examples/ubuntu-vm-local-block-pv.yaml +++ b/examples/ubuntu-vm-local-block-pv.yaml @@ -49,7 +49,7 @@ spec: apiVersion: v1 kind: Pod metadata: - name: ubuntu-vm + name: ubuntu-vm-local-block-pv annotations: kubernetes.io/target-runtime: virtlet.cloud VirtletSSHKeys: | diff --git a/examples/ubuntu-vm-rbd-block-pv.yaml b/examples/ubuntu-vm-rbd-block-pv.yaml index 5622966f6..9e3187c37 100644 --- a/examples/ubuntu-vm-rbd-block-pv.yaml +++ b/examples/ubuntu-vm-rbd-block-pv.yaml @@ -36,7 +36,7 @@ spec: apiVersion: v1 kind: Pod metadata: - name: ubuntu-vm + name: ubuntu-vm-rdb-block-pv annotations: kubernetes.io/target-runtime: virtlet.cloud VirtletSSHKeys: |