Skip to content

Commit ce4a042

Browse files
authored
Merge pull request #5468 from nawazkh/nhk_cleanup
Update hrefs in the documentation
2 parents ab2bbfb + 238c83c commit ce4a042

File tree

4 files changed

+7
-43
lines changed

4 files changed

+7
-43
lines changed

docs/book/src/developers/development.md

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
- [Tilt for dev in CAPZ](#tilt-for-dev-in-capz)
2222
- [Tilt for dev in both CAPZ and CAPI](#tilt-for-dev-in-both-capz-and-capi)
2323
- [Deploying a workload cluster](#deploying-a-workload-cluster)
24-
- [Tilt for dev using internal load balancer (ILB) for intra-cluster node-apiserver traffic](#tilt-for-dev-using-internal-load-balancer-ilb-for-intra-cluster-node-apiserver-traffic)
25-
- [Flavors for dev using internal load balancer (ILB) for intra-cluster node-apiserver traffic](#flavors-for-dev-using-internal-load-balancer-ilb-for-intra-cluster-node-apiserver-traffic)
24+
- [Tilt for dev using internal load balancer (ILB) for intra-cluster node-apiserver traffic](./tilt-with-aks-as-mgmt-ilb.md#tilt-workflow-for-aks-as-management-cluster-with-internal-load-balancer)
25+
- [Flavors for dev using internal load balancer (ILB) for intra-cluster node-apiserver traffic](./tilt-with-aks-as-mgmt-ilb.md#flavors-leveraging-internal-load-balancer)
2626
- [Viewing Telemetry](#viewing-telemetry)
2727
- [Debugging](#debugging)
2828
- [Manual Testing](#manual-testing)
@@ -257,38 +257,6 @@ make delete-workload-cluster
257257

258258
> Check out the [self-managed](../self-managed/troubleshooting.md) and [managed](../managed/troubleshooting.md) troubleshooting guides for common errors you might run into.
259259
260-
#### Tilt for dev using internal load balancer (ILB) for intra-cluster node-apiserver traffic
261-
262-
263-
264-
This flow is for developers who want to leverage the internal load balancer for intra-cluster node-apiserver traffic.
265-
You can achieve this by setting the `EXP_APISERVER_ILB` environment variable to `true` in your shell (run `export EXP_APISERVER_ILB=true`) and then create the CAPZ management cluster.
266-
267-
We also encourage you to use AKS cluster as your management cluster.
268-
269-
Outline of the steps:
270-
- `make clean`
271-
- `make generate`
272-
- Set `REGISTRY` in your env. Preferably an Azure Container Registry.
273-
- Run `docker-build-all` to build all the images.
274-
- Run `make acr-login` to login to your ACR.
275-
- Run `docker-push-all` to push all the images to your ACR.
276-
- Run `make aks-create` to create an AKS cluster. _Notice the changes that get applied to the `tilt-settings.yaml` file._
277-
- Run `export EXP_APISERVER_ILB=true` in your shell.
278-
- Run `make tilt-up` to start Tilt.
279-
280-
```
281-
TODO:
282-
1. Come up with a shorter make target to do all the above steps for MS Tenants.
283-
2. VNet peering should be exported out as a shell script for users to run.
284-
```
285-
286-
##### Flavors for dev using internal load balancer (ILB) for intra-cluster node-apiserver traffic
287-
288-
There are two flavors available for development in CAPZ for MSFT Tenant:
289-
- [apiserver-ilb](../../../../templates/cluster-template-apiserver-ilb.yaml): VM based default flavor that brings up native K8s clusters with Linux nodes.
290-
- [apiserver-ilb-windows](../../../../templates/cluster-template-windows-apiserver-ilb.yaml): VM based flavor that brings up native K8s clusters with Linux and Windows nodes.
291-
292260
#### Viewing Telemetry
293261

294262
The CAPZ controller emits tracing and metrics data. When run in Tilt, the KinD management cluster is

docs/book/src/developers/tilt-with-aks-as-mgmt-ilb.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,11 @@ By default using Tilt with Cluster API Provider Azure (CAPZ), the management clu
8585
- Use 3 control plane nodes in a stacked etcd setup.
8686
- Using aks as management cluster sets `CONTROL_PLANE_MACHINE_COUNT` to 3 by default.
8787

88-
### Flavors leveraging internal load balancer
89-
- `cluster-template-apiserver-ilb.yaml`
90-
- `cluster-template-windows-apiserver-ilb.yaml`
88+
##### Flavors leveraging internal load balancer
89+
90+
There are two flavors available for development in CAPZ for MSFT Tenant:
91+
- [apiserver-ilb](../../../../templates/cluster-template-apiserver-ilb.yaml): VM based default flavor that brings up native K8s clusters with Linux nodes.
92+
- [apiserver-ilb-windows](../../../../templates/cluster-template-windows-apiserver-ilb.yaml): VM based flavor that brings up native K8s clusters with Linux and Windows nodes.
9193

9294
#### Tilt Workflow for AKS as Management Cluster with Internal Load Balancer
9395

templates/cluster-template-apiserver-ilb-README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

templates/cluster-template-windows-apiserver-ilb-README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)