Skip to content

Commit 1e4a5d3

Browse files
committed
Update docs to reference main branch
1 parent ca38cae commit 1e4a5d3

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Each version of Cluster API for Azure will attempt to support at least two Kuber
5858

5959
Please see our [Book](https://capz.sigs.k8s.io) for in-depth user documentation.
6060

61-
Additional docs can be found in the `/docs` directory, and the [index is here](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/master/docs/README.md).
61+
Additional docs can be found in the `/docs` directory, and the [index is here](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/docs/README.md).
6262

6363

6464
## Getting involved and contributing
@@ -137,4 +137,4 @@ We also use the issue tracker to track features. If you have an idea for a featu
137137
[slack_info]: https://github.com/kubernetes/community/tree/master/communication#slack
138138
[cluster_api]: https://github.com/kubernetes-sigs/cluster-api
139139
[quickstart]: https://cluster-api.sigs.k8s.io/user/quick-start.html
140-
[flavors_doc]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/master/templates/flavors/README.md
140+
[flavors_doc]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/templates/flavors/README.md

Diff for: docs/book/src/developers/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ You can also customize the configuration of the CAPZ cluster (assuming that `SKI
501501
[image_pull_secrets]: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
502502
[gettext]: https://www.gnu.org/software/gettext/
503503
[gettextwindows]: https://mlocati.github.io/articles/gettext-iconv-windows.html
504-
[go.mod]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/master/go.mod
504+
[go.mod]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/go.mod
505505
[kind]: https://sigs.k8s.io/kind
506506
[azure_cli]: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest
507507
[manifests]: /docs/manifests.md

Diff for: docs/book/src/developers/releasing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
## Prepare branch, tag and release notes
1010
- Identify a known good commit on the main branch
11-
- Fast-forward the release branch to the selected commit. :warning: Always release from the release branch and not from master!
11+
- Fast-forward the release branch to the selected commit. :warning: Always release from the release branch and not from main!
1212
- `git checkout release-0.x`
1313
- `git fetch upstream`
14-
- `git merge --ff-only upstream/master`
14+
- `git merge --ff-only upstream/main`
1515
- `git push`
1616
- Create tag with git
1717
- `export RELEASE_TAG=v0.4.6` (the tag of the release to be cut)

Diff for: docs/book/src/topics/aad-integration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ az ad app permission grant --id ${AZURE_CLIENT_APP_ID} --api ${AZURE_SERVER_APP_
5858

5959
## Create the cluster
6060

61-
To deploy a cluster with support for AAD, use the [aad flavor](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-aad.yaml).
61+
To deploy a cluster with support for AAD, use the [aad flavor](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-aad.yaml).
6262

6363
Make sure that `AZURE_SERVER_APP_ID` is set to the ID of the server AD application created above.
6464

Diff for: docs/book/src/topics/cloud-provider-config.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ All cloud provider config values can be customized by creating the `${RESOURCE}-
6969

7070
# External Cloud Provider
7171

72-
To deploy a cluster using [external cloud provider](https://github.com/kubernetes-sigs/cloud-provider-azure), create a cluster configuration with the [external cloud provider template](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-external-cloud-provider.yaml).
72+
To deploy a cluster using [external cloud provider](https://github.com/kubernetes-sigs/cloud-provider-azure), create a cluster configuration with the [external cloud provider template](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-external-cloud-provider.yaml).
7373

7474
After deploying the cluster, you should eventually see a set of pods like the following in a `Running` state:
7575

Diff for: docs/book/src/topics/gpu.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Before you begin, be aware that:
1010
- [NVIDIA GPUs](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes-gpu) are supported on Azure NC-series, NV-series, and NVv3-series VMs
1111
- [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) allows administrators of Kubernetes clusters to manage GPU nodes just like CPU nodes in the cluster.
1212

13-
To deploy a cluster with support for GPU nodes, use the [nvidia-gpu flavor](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-nvidia-gpu.yaml).
13+
To deploy a cluster with support for GPU nodes, use the [nvidia-gpu flavor](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-nvidia-gpu.yaml).
1414

1515
## An example GPU cluster
1616

Diff for: docs/book/src/topics/ipv6.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CAPZ enables you to create IPv6 Kubernetes clusters on Microsoft Azure.
77
- IPv6 support is available for Kubernetes version 1.18.0 and later on Azure.
88
- IPv6 support is in beta as of Kubernetes version 1.18 in Kubernetes community.
99

10-
To deploy a cluster using IPv6, use the [ipv6 flavor template](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-ipv6.yaml).
10+
To deploy a cluster using IPv6, use the [ipv6 flavor template](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-ipv6.yaml).
1111

1212
<aside class="note warning">
1313

@@ -117,7 +117,7 @@ curl [2603:1030:805:2::b] -v
117117
118118
## Known Limitations
119119
120-
The reference [ipv6 flavor](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-ipv6.yaml) takes care of most of these for you, but it is important to be aware of these if you decide to write your own IPv6 cluster template, or use a different bootstrap provider.
120+
The reference [ipv6 flavor](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-ipv6.yaml) takes care of most of these for you, but it is important to be aware of these if you decide to write your own IPv6 cluster template, or use a different bootstrap provider.
121121
122122
- Kubernetes version needs to be 1.18+
123123

Diff for: docs/book/src/topics/machinepools.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ clusterctl generate cluster my-cluster --kubernetes-version v1.21.2 --flavor mac
9393
```
9494

9595
The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors)
96-
is located [here](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-machinepool.yaml).
96+
is located [here](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-machinepool.yaml).
9797

9898
### Example MachinePool, AzureMachinePool and KubeadmConfig Resources
9999
Below is an example of the resources needed to create a pool of Virtual Machines orchestrated with

Diff for: docs/book/src/topics/windows.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
CAPZ enables you to create Windows Kubernetes clusters on Microsoft Azure.
66

7-
To deploy a cluster using Windows, use the [Windows flavor template](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/master/templates/cluster-template-windows.yaml).
7+
To deploy a cluster using Windows, use the [Windows flavor template](https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/cluster-template-windows.yaml).
88

99
## Deploy a workload
1010

@@ -97,7 +97,7 @@ To SSH:
9797
ssh -t -i .sshkey -o 'ProxyCommand ssh -i .sshkey -W %h:%p capi@<api-server-ip>' capi@<windows-ip> powershell.exe
9898
```
9999

100-
> There is also a [CAPZ kubectl plugin](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/master/hack/debugging/Readme.md) that automates the ssh connection using the Management cluster
100+
> There is also a [CAPZ kubectl plugin](https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/hack/debugging/Readme.md) that automates the ssh connection using the Management cluster
101101
102102
To RDP you can proxy through the api server:
103103

0 commit comments

Comments
 (0)