Merge "KubeVirt Doc changes (r8, dsr8)"

doc/source/kube-virt/create-an-ubuntu-vm-fafb82ec424b.rst

@@ -115,12 +115,12 @@ The example uses:
 
       .. code-block:: yaml
 
-         $ cat <<EOF > stx-lab-ubuntu-test-vm.yaml
+         $ cat <<EOF > stx-lab-ubuntu-test.yaml
          apiVersion: kubevirt.io/v1alpha3
          kind: VirtualMachine
          metadata:
            labels:
-           kubevirt.io/vm: stx-lab-ubuntu-test
+             kubevirt.io/vm: stx-lab-ubuntu-test
            name: stx-lab-ubuntu-test
            namespace: stx-lab
          spec:
@@ -138,7 +138,7 @@ The example uses:
                      name: myrootdisk
                    - disk:
                        bus: virtio
-                       name: cloudinitdisk
+                     name: cloudinitdisk
                    interfaces:
                    - masquerade: {}
                      name: default
@@ -162,12 +162,12 @@ The example uses:
                  dataVolume:
                    name: stx-lab-ubuntu-test-disk
                - cloudInitNoCloud:
-                 userData: |-
+                   userData: |-
-                   #cloud-config
+                     #cloud-config
-                   user: jenkins
+                     user: jenkins
-                   password: myP@ssw0rd
+                     password: myP@ssw0rd
-                   chpasswd: { expire: False }
+                     chpasswd: { expire: False }
-                   ssh_pwauth: True
+                     ssh_pwauth: True
                  name: cloudinitdisk
          EOF
 
@@ -175,14 +175,14 @@ The example uses:
 
       .. code-block::
 
-         $ kubectl apply -f stx-lab-ubuntu-test-vm.yaml
+         $ kubectl apply -f stx-lab-ubuntu-test.yaml
 
    #. Connect to console and configure |VM| and the |VM|'s interface on the
       10.10.186.0/24 network.
 
       .. code-block::
 
-         $ virtctl -n stx-lab console stx-lab-ubuntu-test-vm
+         $ virtctl -n stx-lab console stx-lab-ubuntu-test
          Successfully connected to stx-lab-ubuntu-test console. The escape sequence is ^]4
 
          stx-lab-ubuntu-test login: jenkins

doc/source/kube-virt/hello-world-kubevirt-vm-05503659173c.rst

@@ -43,13 +43,23 @@ the |VM| via the console:
    .. code-block:: yaml
 
       apiVersion: kubevirt.io/v1
-      kind: VirtualMachineInstance
+      kind: VirtualMachine
       metadata:
+        labels:
+          kubevirt.io/vm: vm-cirros
         name: vm-cirros
+      spec:
+        running: false
+        template:
+          metadata:
+            labels:
+              kubevirt.io/vm: vm-cirros
       spec:
         domain:
           devices:
             disks:
+            -disk:
+               bus: virtio
             - name: containerdisk
               disk:
                 bus: virtio
@@ -66,7 +76,7 @@ the |VM| via the console:
               image: kubevirt/cirros-container-disk-demo:latest
           - name: cloudinitdisk
             cloudInitNoCloud:
-              userDataBase64: IyEvYmluL3NoCgplY2hvICdwcmludGVkIGZyb20gY2xvdWQtaW5pdCB1c2VyZGF0YScKWQtaW5pdCB1c2VyZGF0YScK
+              userDataBase64: IyEvYmluL3NoCmVjaG8gJ3ByaW50ZWQgZnJvbSBjbG91ZC1pbml0IHVzZXJkYXRhJwo=
 
 #. Apply the ``yaml`` file to create the |VM| in a stopped state.
 
@@ -108,8 +118,6 @@ the |VM| via the console:
        # vm-cirros login: cirros
        Password:
 
-       $ hostname vm-cirros
-
        $ ls /
          bin       home           lib64          mnt         root        tmp
          boot      init           linuxrc        old-root    run         usr
@@ -155,8 +163,6 @@ the |VM| via the console:
       $ ssh -p 31562 cirros@<Floating-OAM-IP-Address-of-|prod|>
       password:
 
-      $ hostname vm-cirros
-
       # List Interfaces
       # Notice how the VM has a single eth0 interface, the default CNI interface.
 

doc/source/kube-virt/installation-66477d7646db.rst

@@ -15,7 +15,7 @@ Complete the following steps to install KubeVirt.
 
       .. code-block:: none
 
-          ~(keystone_admin)$ system application-upload /usr/local/share/applications/helm/kubevirt-app-1.0-1.tgz
+          ~(keystone_admin)$ system application-upload /usr/local/share/applications/helm/kubevirt-app-<version>.tgz
 
           ~(keystone_admin)$ system application-list
 

doc/source/kube-virt/set-up-cdi-proxy-ad165d884417.rst

@@ -24,7 +24,8 @@ Configuring the NodePort service option is shown below:
 
    .. code-block:: yaml
 
-      $ cat <<EOF > cdi-uploadproxy-nodeport-service.yaml apiVersion: v1
+      $ cat <<EOF > cdi-uploadproxy-nodeport-service.yaml
+      apiVersion: v1
       kind: Service
       metadata:
         name: cdi-uploadproxy-nodeport
@@ -34,12 +35,12 @@ Configuring the NodePort service option is shown below:
       spec:
         type: NodePort
         ports:
-          - port: 443
+            - port: 443
-          targetPort: 8443
+              targetPort: 8443
-          nodePort: 32111 # Use unused nodeport in 31,500 to 32,767 range 
+              nodePort: 32111 # Use unused nodeport in 31,500 to 32,767 range
-          protocol: TCP
+              protocol: TCP
-      selector:
+        selector:
-        cdi.kubevirt.io: cdi-uploadproxy
+          cdi.kubevirt.io: cdi-uploadproxy
       EOF
 
 
@@ -61,10 +62,9 @@ named stx-lab-jenkins-disk:
 
 .. code-block::
 
-   $ virtctl image-upload dv stx-lab-jenkins-disk -n jenkins-ns --insecure \
+   $ virtctl image-upload dv <DV-Name> -n <NameSpace> --insecure \
-     --access-mode ReadWriteOnce --size 500Gi --image-path \
+     --access-mode ReadWriteOnce --size <size>Gi --image-path <Image-Path> \
-     /home/sysadmin/admin/kubevirt/images/jammy-server-cloudimg-amd64.img     \
+     --uploadproxy-url https://<NodeIP>:<PORT>
-     --uploadproxy-url https://admin.starlingx.abc.com:32111
 
 See sections on :ref:`create-an-ubuntu-vm-fafb82ec424b` and
 :ref:`create-a-windows-vm-82957181df02` on how to then use this DataVolume to