Skip to content

Commit 9a15a48

Browse files
authored
Enhance local development documentation (#2162)
1 parent 635721a commit 9a15a48

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

docs/book/src/developer/e2e.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
* The end-to-end tests for `VPC` and `PowerVS` run on an internal prow cluster on IBM Cloud.
66
* Resource management is handled via [boskos](https://github.com/kubernetes-sigs/boskos) which is an efficient way to lease infra and clean up after every run.
7-
* The E2E tests use the Cluster API test framework. For more information on developing E2E tests, refer [here](https://cluster-api.sigs.k8s.io/developer/e2e).
7+
* The E2E tests use the Cluster API test framework. For more information on developing E2E tests, refer [here](https://cluster-api.sigs.k8s.io/developer/core/e2e).
88

99
### Jobs
1010

docs/book/src/developer/tilt.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Next, create a `tilt-settings.yaml` file and place it in your local copy of `clu
7575
Make sure to set a valid API key for the field `IBMCLOUD_API_KEY`.
7676

7777
```yaml
78-
default_registry: "gcr.io/you-project-name-here"
78+
default_registry: "localhost:5001"
7979
provider_repos:
8080
- ../cluster-api-provider-ibmcloud
8181
enable_providers:
@@ -104,7 +104,7 @@ extra_args:
104104
To deploy workload cluster with [clusterclass-template](/topics/powervs/clusterclass-cluster.html), enable the feature gates `EXP_CLUSTER_RESOURCE_SET` and `CLUSTER_TOPOLOGY` to `true` under kustomize_substitutions.
105105

106106
```yaml
107-
default_registry: "gcr.io/you-project-name-here"
107+
default_registry: "localhost:5001"
108108
provider_repos:
109109
- ../cluster-api-provider-ibmcloud
110110
enable_providers:
@@ -121,7 +121,7 @@ kustomize_substitutions:
121121

122122
To deploy workload cluster with Custom Service Endpoint, Set `SERVICE_ENDPOINT` environmental variable in semi-colon separated format: `${ServiceRegion}:${ServiceID1}=${URL1},${ServiceID2}=${URL2...}`
123123
```yaml
124-
default_registry: "gcr.io/you-project-name-here"
124+
default_registry: "localhost:5001"
125125
provider_repos:
126126
- ../cluster-api-provider-ibmcloud
127127
enable_providers:
@@ -136,10 +136,10 @@ kustomize_substitutions:
136136

137137
### 3. Configuration to use observability tools
138138

139-
- cluster-api provides support for deploying observability tools, More information about it is available in cluster-api [book](https://cluster-api.sigs.k8s.io/developer/logging#developing-and-testing-logs).
139+
- cluster-api provides support for deploying observability tools, More information about it is available in cluster-api [book](https://cluster-api.sigs.k8s.io/developer/core/logging#developing-and-testing-logs).
140140

141141
```yaml
142-
default_registry: "gcr.io/you-project-name-here"
142+
default_registry: "localhost:5001"
143143
deploy_observability:
144144
- promtail
145145
- loki
@@ -169,7 +169,7 @@ extra_args:
169169
- "--logging-format=json"
170170
```
171171

172-
**NOTE**: For information about all the fields that can be used in the `tilt-settings.yaml` file, check them [here](https://cluster-api.sigs.k8s.io/developer/tilt.html#tilt-settings-fields).
172+
**NOTE**: For information about all the fields that can be used in the `tilt-settings.yaml` file, check them [here](https://cluster-api.sigs.k8s.io/developer/core/tilt.html#tilt-settings-fields).
173173

174174
## Run Tilt
175175

docs/book/src/topics/powervs/creating-a-cluster.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ following the steps below.
4040
> **Note:**
4141
> - Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
4242
> - The `IBMPOWERVS_IMAGE_NAME` value below should reflect the name of the custom image and the `kubernetes-version` value below should reflect the kubernetes version of the custom image.
43+
> - While working with unreleased versions like from main branch, instead of `--flavor=powervs` use `--from=./templates/cluster-template-powervs.yaml`.
4344

4445
```console
4546
IBMPOWERVS_SSHKEY_NAME="my-pub-key" \
@@ -139,6 +140,8 @@ following the steps below.
139140
#### Prerequisites:
140141
- Already existing infrasturcture resources can be used for cluster creation by setting either the ID or name in spec. If neither are specified, the cluster name will be used for constructing the resource name. For example, if cluster name is `capi-powervs`, PowerVS workspace will be created with name `capi-powervs-serviceInstance`.
141142

143+
**Note:** While working with unreleased versions like from main branch, instead of `--flavor=powervs-create-infra` use `--from=./templates/cluster-template-powervs-create-infra.yaml`.
144+
142145
```
143146
IBMCLOUD_API_KEY=XXXXXXXXXXXX \
144147
IBMPOWERVS_SSHKEY_NAME="my-ssh-key" \
@@ -163,6 +166,8 @@ following the steps below.
163166
#### Prerequisites:
164167
- To deploy a cluster using [ClusterClass](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-class/index.html), set `CLUSTER_TOPOLOGY` environment variable to `true`.
165168
169+
**Note:** While working with unreleased versions like from main branch, instead of `--flavor=powervs-clusterclass` use `--from=./templates/cluster-template-powervs-clusterclass.yaml`.
170+
166171
```
167172
IBMPOWERVS_CLUSTER_CLASS_NAME="powervs-cc" \
168173
IBMPOWERVS_SSHKEY_NAME="my-pub-key" \

docs/book/src/topics/vpc/creating-a-cluster.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ following the steps below.
1212

1313
1. Using clusterctl, render the yaml through templates and deploy the cluster
1414

15-
16-
**Note:** the `IBMVPC_IMAGE_NAME` value below should reflect the name of the custom qcow2 image
15+
> **Note:**
16+
> - The `IBMVPC_IMAGE_NAME` value below should reflect the name of the custom qcow2 image.
17+
> - While working with unreleased versions like from main branch, instead of `--flavor=vpc-clusterclass` use `--from ./templates/cluster-template-vpc-clusterclass.yaml`.
1718
1819
```console
1920
IBMCLOUD_API_KEY="XXXXXXXXXXXXXXXXXX" \

docs/book/src/user/troubleshooting.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@
5252
```
5353
ssh -J root@<public_ip> root@<dhcp_ip>
5454
```
55+
56+
### 3. Failed to apply a cluster template with release not found error
57+
58+
While trying to apply a cluster template from unreleased version like from main branch, we will run into error like `release not found for version vX.XX.XX`. In that case, instead of `--flavor` we need to use `--from=<path_to_cluster_template>`.

0 commit comments

Comments
 (0)