Merge pull request kubevirt#1108 from rmohr/getting-started-fixes

Fix some bumps in the getting started guide
portalgun-io · Jun 6, 2018 · 7315047 · 7315047
2 parents 3cc1ca9 + 3601c8f
commit 7315047
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -54,9 +54,13 @@ on a recent Fedora or Ubuntu and follow [these steps](https://github.com/kubevir
 **Developer** To set up a development environment please read our
 [Getting Started Guide](docs/getting-started.md). To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/master/CONTRIBUTING.md).
 
-
 ## Documentation
 
+ * [User-Guide](https://www.kubevirt.io/user-guide)
+ * [API Reference](https://www.kubevirt.io/api-reference/)
+
+## Architecture
+
 You can learn more about how KubeVirt is designed (and why it is that way),
 and learn more about the major components by taking a look at
 [our documentation](docs/):

diff --git a/cluster/examples/ovm-cirros.yaml b/cluster/examples/ovm-cirros.yaml
@@ -33,7 +33,7 @@ spec:
       volumes:
       - name: registryvolume
         registryDisk:
-          image: kubevirt/cirros-registry-disk-demo:devel
+          image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
       - cloudInitNoCloud:
           userData: |
             #!/bin/sh

diff --git a/cluster/examples/vm-ephemeral.yaml b/cluster/examples/vm-ephemeral.yaml
@@ -20,5 +20,5 @@ spec:
   volumes:
   - name: registryvolume
     registryDisk:
-      image: kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
 status: {}
diff --git a/cluster/examples/vm-fedora.yaml b/cluster/examples/vm-fedora.yaml
@@ -24,7 +24,7 @@ spec:
   volumes:
   - name: registryvolume
     registryDisk:
-      image: kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
   - cloudInitNoCloud:
       userData: |-
         #cloud-config

diff --git a/cluster/examples/vm-flavor-small.yaml b/cluster/examples/vm-flavor-small.yaml
@@ -22,5 +22,5 @@ spec:
   volumes:
   - name: registryvolume
     registryDisk:
-      image: kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
 status: {}
diff --git a/cluster/examples/vm-nocloud.yaml b/cluster/examples/vm-nocloud.yaml
@@ -28,7 +28,7 @@ spec:
   volumes:
   - name: registryvolume
     registryDisk:
-      image: kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
   - cloudInitNoCloud:
       userData: |
         #!/bin/sh

diff --git a/cluster/examples/vm-replicaset-cirros.yaml b/cluster/examples/vm-replicaset-cirros.yaml
@@ -30,5 +30,5 @@ spec:
       volumes:
       - name: registryvolume
         registryDisk:
-          image: kubevirt/cirros-registry-disk-demo:devel
+          image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
 status: {}
diff --git a/cluster/examples/vm-sata.yaml b/cluster/examples/vm-sata.yaml
@@ -20,5 +20,5 @@ spec:
   volumes:
   - name: registryvolume
     registryDisk:
-      image: kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
 status: {}
diff --git a/cluster/vm-template-fedora.yaml b/cluster/vm-template-fedora.yaml
@@ -41,7 +41,7 @@ objects:
         volumes:
           - name: registryvolume
             registryDisk:
-              image: kubevirt/fedora-cloud-registry-disk-demo:devel
+              image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
           - name: cloudinitvolume
             cloudInitNoCloud:
               userDataBase64: I2Nsb3VkLWNvbmZpZwpwYXNzd29yZDogYXRvbWljCnNzaF9wd2F1dGg6IFRydWUKY2hwYXNzd2Q6IHsgZXhwaXJlOiBGYWxzZSB9Cg==

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -8,6 +8,11 @@ development cluster.
 The KubeVirt build system runs completely inside docker. In order to build
 KubeVirt you need to have `docker` and `rsync` installed.
 
+**Note:** For running KubeVirt in the dockerized cluster, **nested
+virtualization** must be enabled. As an alternative [software
+emulation](software-emulation.md) can be allowed. Enabling nested
+virtualization should be preferred.
+
 ### Dockerized environment
 
 Runs master and nodes containers, when each one of them run virtual machine via QEMU.

diff --git a/tools/vms-generator/vms-generator.go b/tools/vms-generator/vms-generator.go
@@ -68,7 +68,7 @@ const windowsFirmware = "5d307ca9-b3ef-428c-8861-06e72d69f223"
 
 const apiVersion = "kubevirt.io/v1alpha1"
 
-var dockerPrefix = "kubevirt"
+var dockerPrefix = "registry:5000/kubevirt"
 var dockerTag = "devel"
 
 var gracePeriod = int64(0)