From afc0ea5ab57c13437db25fc717bc69038935fdcf Mon Sep 17 00:00:00 2001 From: wlp1153468871 Date: Fri, 23 Feb 2024 16:49:23 +0800 Subject: [PATCH 1/2] virtnest-fix/3335 --- docs/zh/docs/virtnest/vm/index.md | 105 ++++++++++++++++-------------- 1 file changed, 57 insertions(+), 48 deletions(-) diff --git a/docs/zh/docs/virtnest/vm/index.md b/docs/zh/docs/virtnest/vm/index.md index ff78d555b3..07f39b73bb 100644 --- a/docs/zh/docs/virtnest/vm/index.md +++ b/docs/zh/docs/virtnest/vm/index.md @@ -160,53 +160,62 @@ ```yaml apiVersion: kubevirt.io/v1 - kind: VirtualMachine - metadata: - name: example - namespace: default +kind: VirtualMachine +metadata: + name: demo + namespace: default +spec: + dataVolumeTemplates: + - metadata: + name: systemdisk-demo + namespace: default + spec: + pvc: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi + storageClassName: hwameistor-storage-lvm-hdd + source: + registry: + url: >- + docker://release-ci.daocloud.io/virtnest/system-images/ubuntu-22.04-x86_64:v1 + runStrategy: Always + template: spec: - dataVolumeTemplates: - - metadata: - name: systemdisk-example - spec: - pvc: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi - storageClassName: rook-ceph-block - source: - registry: - url: >- - docker://release-ci.daocloud.io/virtnest/system-images/centos-7.9-x86_64:v1 - runStrategy: Always - template: - spec: - domain: - cpu: - cores: 1 - devices: - disks: - - disk: - bus: virtio - name: systemdisk-example - - disk: - bus: virtio - name: cloudinitdisk - interfaces: - - masquerade: {} - name: default - machine: - type: q35 - resources: - requests: - memory: 1Gi - networks: - - name: default - pod: {} - volumes: - - dataVolume: - name: systemdisk-example - name: systemdisk-example + architecture: amd64 + domain: + cpu: + cores: 1 + sockets: 1 + threads: 1 + devices: + disks: + - bootOrder: 1 + disk: + bus: virtio + name: systemdisk-demo + - disk: + bus: virtio + name: cloudinitdisk + interfaces: + - masquerade: {} + name: default + machine: + type: q35 + resources: + requests: + memory: 2Gi + networks: + - name: default + pod: {} + volumes: + - dataVolume: + name: systemdisk-demo + name: systemdisk-demo + - cloudInitNoCloud: + userDataBase64: >- + I2Nsb3VkLWNvbmZpZwpzc2hfcHdhdXRoOiB0cnVlCmRpc2FibGVfcm9vdDogZmFsc2UKY2hwYXNzd2Q6IHsibGlzdCI6ICJyb290OjEyMzQ1NiIsIGV4cGlyZTogRmFsc2V9CgoKcnVuY21kOgogIC0gc2VkIC1pICIvI1w/UGVybWl0Um9vdExvZ2luL3MvXi4qJC9QZXJtaXRSb290TG9naW4geWVzL2ciIC9ldGMvc3NoL3NzaGRfY29uZmlnCiAgLSBzeXN0ZW1jdGwgcmVzdGFydCBzc2guc2VydmljZQ== + name: cloudinitdisk ``` From ab23ef5060e6728798c483bbc71030a88af8c7c6 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 23 Feb 2024 17:11:26 +0800 Subject: [PATCH 2/2] Update index.md --- docs/zh/docs/virtnest/vm/index.md | 110 +++++++++++++++--------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/docs/zh/docs/virtnest/vm/index.md b/docs/zh/docs/virtnest/vm/index.md index 07f39b73bb..f5b46212ce 100644 --- a/docs/zh/docs/virtnest/vm/index.md +++ b/docs/zh/docs/virtnest/vm/index.md @@ -160,62 +160,62 @@ ```yaml apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: demo - namespace: default -spec: - dataVolumeTemplates: - - metadata: - name: systemdisk-demo - namespace: default - spec: - pvc: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi - storageClassName: hwameistor-storage-lvm-hdd - source: - registry: - url: >- - docker://release-ci.daocloud.io/virtnest/system-images/ubuntu-22.04-x86_64:v1 - runStrategy: Always - template: + kind: VirtualMachine + metadata: + name: demo + namespace: default spec: - architecture: amd64 - domain: - cpu: - cores: 1 - sockets: 1 - threads: 1 - devices: - disks: - - bootOrder: 1 - disk: - bus: virtio + dataVolumeTemplates: + - metadata: + name: systemdisk-demo + namespace: default + spec: + pvc: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi + storageClassName: hwameistor-storage-lvm-hdd + source: + registry: + url: >- + docker://release-ci.daocloud.io/virtnest/system-images/ubuntu-22.04-x86_64:v1 + runStrategy: Always + template: + spec: + architecture: amd64 + domain: + cpu: + cores: 1 + sockets: 1 + threads: 1 + devices: + disks: + - bootOrder: 1 + disk: + bus: virtio + name: systemdisk-demo + - disk: + bus: virtio + name: cloudinitdisk + interfaces: + - masquerade: {} + name: default + machine: + type: q35 + resources: + requests: + memory: 2Gi + networks: + - name: default + pod: {} + volumes: + - dataVolume: + name: systemdisk-demo name: systemdisk-demo - - disk: - bus: virtio + - cloudInitNoCloud: + userDataBase64: >- + I2Nsb3VkLWNvbmZpZwpzc2hfcHdhdXRoOiB0cnVlCmRpc2FibGVfcm9vdDogZmFsc2UKY2hwYXNzd2Q6IHsibGlzdCI6ICJyb290OjEyMzQ1NiIsIGV4cGlyZTogRmFsc2V9CgoKcnVuY21kOgogIC0gc2VkIC1pICIvI1w/UGVybWl0Um9vdExvZ2luL3MvXi4qJC9QZXJtaXRSb290TG9naW4geWVzL2ciIC9ldGMvc3NoL3NzaGRfY29uZmlnCiAgLSBzeXN0ZW1jdGwgcmVzdGFydCBzc2guc2VydmljZQ== name: cloudinitdisk - interfaces: - - masquerade: {} - name: default - machine: - type: q35 - resources: - requests: - memory: 2Gi - networks: - - name: default - pod: {} - volumes: - - dataVolume: - name: systemdisk-demo - name: systemdisk-demo - - cloudInitNoCloud: - userDataBase64: >- - I2Nsb3VkLWNvbmZpZwpzc2hfcHdhdXRoOiB0cnVlCmRpc2FibGVfcm9vdDogZmFsc2UKY2hwYXNzd2Q6IHsibGlzdCI6ICJyb290OjEyMzQ1NiIsIGV4cGlyZTogRmFsc2V9CgoKcnVuY21kOgogIC0gc2VkIC1pICIvI1w/UGVybWl0Um9vdExvZ2luL3MvXi4qJC9QZXJtaXRSb290TG9naW4geWVzL2ciIC9ldGMvc3NoL3NzaGRfY29uZmlnCiAgLSBzeXN0ZW1jdGwgcmVzdGFydCBzc2guc2VydmljZQ== - name: cloudinitdisk ```