Skip to content

Commit

Permalink
Merge pull request kubevirt#604 from lukas-bednar/docs
Browse files Browse the repository at this point in the history
docs: small typo fixes
  • Loading branch information
rmohr authored Dec 7, 2017
2 parents bc92617 + 26ef5b7 commit 796ab5e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ as Pods (or similar) _on top of_ the Kubernetes cluster, and are not installed
alongside of it. The type is - as said before - even defined inside the
Kubernetes API server. This allows users to speak to Kubernetes, but modify VMs.

The following diagram illustrates how the addditional controllers and daemons
The following diagram illustrates how the additional controllers and daemons
communicate with Kubernetes and where the additional types are stored:

![Architecture diagram](architecture.png "Architecture")
Expand Down
2 changes: 1 addition & 1 deletion docs/container-register-disks.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ the kubernetes overlay network like pods.

To continue down the path of allowing users to introduce VM workloads into
an existing kubernetes cluster with as little friction as possible, the next
hurdle for us to overcome is tieing VM disk distribution into the same
hurdle for us to overcome is tying VM disk distribution into the same
mechanism used by pods. To do this, KubeVirt must have a way of storing and
accessing VM disks using a container registry.

Expand Down
4 changes: 2 additions & 2 deletions docs/vm-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ there. Examples are `smartcard`, `input` and `controller`.

### Use optional structs to represent different sources or targets

By having an inlinded wrapper-struct, containing optional structs corresponding
By having an inlined wrapper-struct, containing optional structs corresponding
to different types, we get a reasonable usable API and can maintain explicit
mapping withing the code.

Expand Down Expand Up @@ -374,7 +374,7 @@ disk:
### Disks
`disk`, `lun`, `floppy` and `cdrom` aret top level entries in the `devices`
`disk`, `lun`, `floppy` and `cdrom` are top level entries in the `devices`
array. Based on them, the `*.target` section can therefore be specialized based
on the top level struct. Further, the `*.source` section can be specialized and
can contain structs for traditional sources like `iscsi` or KubeVirt specific
Expand Down
4 changes: 2 additions & 2 deletions tests/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
= Integration tests =
# Integration tests

Integration tests require a running Kubevirt cluster. Once you have a running
Kubevirt cluster, you can use the `-master` and the `-kubeconfig` flags to
point the tests to the cluster.

== Run them on Vagrant ==
## Run them on Vagrant

The vagrant environment has an unprotected haproxy in front of the apiserver,
so only `-master` needs to be set to run the tests.
Expand Down

0 comments on commit 796ab5e

Please sign in to comment.