Skip to content

Commit eb51b18

Browse files
authored
Update docs and fix broken links (#116)
* Update docs and fix broken links * More changes
1 parent 0130662 commit eb51b18

File tree

7 files changed

+16
-34
lines changed

7 files changed

+16
-34
lines changed

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ This provider's versions are able to work on the following versions of Apache Cl
6868

6969
## Operating system images
7070

71-
Note: Cluster API Provider Apache CloudStack relies on a few prerequisites which have to be already
71+
Note: Cluster API Provider CloudStack relies on a few prerequisites which have to be already
7272
installed in the used operating system images, e.g. a container runtime, kubelet, kubeadm, etc.
7373
Reference images can be found in [kubernetes-sigs/image-builder][image-builder].
7474

75-
Prebuilt images can be found [here](prebuilt-images)
75+
Prebuilt images can be found [here][prebuilt-images]
7676

7777
------
7878
## Getting involved and contributing
@@ -86,7 +86,7 @@ involved:
8686

8787
## Code of conduct
8888

89-
Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
89+
Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct][code-of-conduct].
9090

9191
## Github issues
9292

@@ -136,11 +136,12 @@ All the CAPC contributors:
136136

137137
[capi-quick-start]: https://cluster-api.sigs.k8s.io/user/quick-start.html
138138
[cluster_api]: https://sigs.k8s.io/cluster-api
139+
[code-of-conduct]: https://kubernetes.io/community/code-of-conduct/
139140
[getting_started]: https://cluster-api-cloudstack.sigs.k8s.io/getting-started.html
140-
[image-builder]: https://sigs.k8s.io/image-builder/tree/master/images/capi
141+
[image-builder]: https://github.com/kubernetes-sigs/image-builder/tree/master/images/capi
141142
[kops]: https://github.com/kubernetes/kops
142143
[kubicorn]: http://kubicorn.io/
143144
[prebuilt-images]: http://packages.shapeblue.com/cluster-api-provider-cloudstack/images/
144145
[slack]: https://kubernetes.slack.com/messages/cluster-api-cloudstack
145-
[new_bug_issue]: https://sigs.k8s.io/cluster-api-provider-cloudstack/issues/new
146-
[new_feature_issue]: https://sigs.k8s.io/cluster-api-provider-cloudstack/issues/new
146+
[new_bug_issue]: https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/new
147+
[new_feature_issue]: https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/new

docs/book/src/clustercloudstack/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ The list of existing affinity groups can be fetched using the cmk cli as follows
179179
cmk list affinitygroups listall=true | jq '.affinitygroup[] | {name, id}'
180180
```
181181

182-
183182
### VM Details
184183

185184
These are arbitrary key value pairs which are passed as VM details while deploying the nodes.
@@ -194,6 +193,7 @@ TODO / Maybe add feature ?
194193

195194
TODO / Add feature
196195

196+
197197
# Apache CloudStack Credentials
198198

199199
1. Generate the API and Secret Key for your Apache CloudStack instance either via the UI (Accounts > User > API Key) or the `getUserKeys` API.

docs/book/src/development/building.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
1. docker
77
2. kind
88
3. kubectl
9-
4. clusterctl [here][clusterctl-release]
10-
TODO : Update this once there is an official release
9+
4. clusterctl (Requires v1.1.5 +)
1110

1211
2. Create a local docker registry to save your docker image - otherwise, you need an image registry to push it somewhere else.
1312

docs/book/src/development/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Please install the following tools :
1616

1717
### Get the source
1818

19-
Fork the [cluster-api-provider-cloudstack repo](https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack):
19+
Fork the [cluster-api-provider-cloudstack](https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack) repo:
2020

2121
```bash
2222
cd "$(go env GOPATH)"/src

docs/book/src/development/tilt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ kind delete cluster
125125
<!-- References -->
126126
[tilt]: https://tilt.dev
127127
[cluster_api_tilt]: https://cluster-api.sigs.k8s.io/developer/tilt.html
128-
[initial-setup]: ./index.md#initial-setup-for-development-environment
128+
[initial-setup]: ./index.html#initial-setup-for-development-environment

docs/book/src/getting-started.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
1. Follow the instructions [here][capi-quick-start] to install the following tools:
66
- [kubectl][kubectl-install]
7-
- [clusterctl][clusterctl-install]
8-
9-
TODO : Update this once there is an official release
7+
- [clusterctl][clusterctl-install] (Requires v1.1.5 +)
108

119
Optional if you do not have an existing Kubernetes cluster
1210
- [kind][kind-install]
@@ -52,7 +50,7 @@ Run the following command to turn your cluster into a management cluster and loa
5250
[cloudstack-capi-images]: https://image-builder.sigs.k8s.io/capi/providers/cloudstack.html
5351
[docker-install]: https://www.docker.com/
5452
[kind-install]: https://kind.sigs.k8s.io/
55-
[kubectl-install]: [https://kubernetes.io/docs/tasks/tools/install-kubectl/]
53+
[kubectl-install]: https://kubernetes.io/docs/tasks/tools/install-kubectl/
5654
[prebuilt-images]: http://packages.shapeblue.com/cluster-api-provider-cloudstack/images/
5755
5856

docs/book/src/topics/custom-images.md

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,12 @@ As of now, prebuilt images for KVM, VMware and XenServer are available [here][pr
1010

1111
## Building a custom image
1212

13-
Cluster API uses the Kubernetes [Image Builder][image-builder] tools. You should use the [CloudStack images][image-builder-cloudstack] from that project as a starting point for your custom image.
13+
Cluster API uses the Kubernetes [Image Builder][image-builder] tools. You should use the [QEMU images][image-builder-qemu] from that project as a starting point for your custom image.
1414

1515
[The Image Builder Book][capi-images] explains how to build the images defined in that repository, with instructions for [CloudStack CAPI Images][cloudstack-capi-images] in particular.
1616

1717
The image is built using KVM hypervisor as a `qcow2` image.
18-
Following which, it is then converted into `ova` for VMware and `vhd` for XenServer as a `post-processors` build step.
19-
20-
Depending on the requirement and the hypervisor, the `post-processors` can be modified.
21-
22-
If you build Apache CloudStack CAPI images with the `make` targets in Image Builder, these required values are printed after a successful build. For example:
23-
24-
```bash
25-
$ make -C images/capi/ build-cloudstack-ubuntu-2004
26-
# many minutes later...
27-
==> qemu:
28-
Build 'qemu' finished after 45 minutes 54 seconds.
29-
30-
11:13:48 ==> Builds finished. The artifacts of successful builds are:
31-
11:13:48 --> qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
32-
11:13:48 --> qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
33-
11:13:48 --> qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
34-
```
18+
Depending on they hypervisor requirements, it can then converted into `ova` for VMware and `vhd` for XenServer via the `convert-cloudstack-image.sh` script.
3519

3620
### Operating system requirements
3721

@@ -75,7 +59,7 @@ See [Upgrading workload clusters][upgrading-workload-clusters] for more details.
7559
[capi-images]: https://image-builder.sigs.k8s.io/capi/capi.html
7660
[cloudstack-capi-images]: https://image-builder.sigs.k8s.io/capi/providers/cloudstack.html
7761
[image-builder]: https://github.com/kubernetes-sigs/image-builder
78-
[image-builder-cloudstack]: https://github.com/kubernetes-sigs/image-builder/tree/master/images/capi/packer/cloudstack
62+
[image-builder-qemu]: https://github.com/kubernetes-sigs/image-builder/tree/master/images/capi/packer/qemu
7963
[kubeadm-preflight-checks]: https://github.com/kubernetes/kubeadm/blob/master/docs/design/design_v1.10.md#preflight-checks
8064
[prebuilt-images]: http://packages.shapeblue.com/cluster-api-provider-cloudstack/images/
8165
[upgrading-workload-clusters]: https://cluster-api.sigs.k8s.io/tasks/kubeadm-control-plane.html#upgrading-workload-clusters

0 commit comments

Comments
 (0)