Skip to content

Commit 7b87895

Browse files
authored
Merge pull request #388 from shapeblue/update-documentation
Update documentation for v0.5.0
2 parents fa624e9 + b196555 commit 7b87895

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

docs/book/src/clustercloudstack/configuration.md

+15
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,21 @@ cmk list templates zoneid=<zone-id> templatefilter=executable | jq '.template[]
145145

146146
# Optional Configurations
147147

148+
## Integration with CloudStack CKS
149+
150+
CAPC cluster can be integrated with CloudStack CKS to provide a comprehensive view of the cluster resources on CloudStack.
151+
The integration can be enabled by setting the `CLOUDSTACK_SYNC_WITH_ACS` environment variable to `true` before
152+
generating the cluster or by setting CloudStackCluster.spec.syncWithACS to `true` in the cluster definition yaml.
153+
154+
## Project
155+
156+
CAPC cluster can be deployed within a specific project in CloudStack.
157+
The project name can be specified by adding the `CloudStackCluster.spec.project` field in the yaml specification.
158+
159+
The list of projects can be fetched using the cmk cli as follows :
160+
```
161+
cmk list projects listall=true | jq '.project[] | {name, id}'
162+
148163
## Cluster Level Configurations
149164
150165
These configurations are passed while defining the `CloudStackCluster` and apply to the entire cluster.

docs/book/src/getting-started.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
5050
Run the following command to turn your cluster into a management cluster and load the Apache CloudStack components into it.
5151
52-
clusterctl init --infrastructure cloudstack
52+
CAPC_CLOUDSTACKMACHINE_CKS_SYNC=true clusterctl init --infrastructure cloudstack
5353
54-
> If you wish to enable syncing of CAPC resources with cloudstack, set the environment variable
55-
> `CAPC_CLOUDSTACKMACHINE_CKS_SYNC=true` before initializing the cloudstack provider. Or set
56-
> `enable-cloudstack-cks-sync` to true in the deployment for capc-controller.
57-
> This is only supported for Apache CloudStack version 4.19 and above.
54+
> Integration of CAPC with CKS is supported for Apache CloudStack version 4.19 and above.
55+
> If you wish to disable syncing of CAPC resources with cloudstack, set the environment variable
56+
> `CAPC_CLOUDSTACKMACHINE_CKS_SYNC=false` before initializing the cloudstack provider. Or set
57+
> `enable-cloudstack-cks-sync` to `false` in the deployment spec for capc-controller-manager.
5858
5959
<!-- References -->
6060

docs/book/src/topics/index.md

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010

1111
## TODO :
12-
- Registering External Clusters in CloudStack
1312
- Data Disks
1413
- Diff between CKS and CAPC
1514
- E2E Tests

0 commit comments

Comments
 (0)