diff --git a/README.md b/README.md index 375450d6cd5..d98ade13539 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Each version of Cluster API for Azure will attempt to support at least two Kuber Please see our [Book](https://capz.sigs.k8s.io) for in-depth user documentation. -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). +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). ## 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 [slack_info]: https://github.com/kubernetes/community/tree/master/communication#slack [cluster_api]: https://github.com/kubernetes-sigs/cluster-api [quickstart]: https://cluster-api.sigs.k8s.io/user/quick-start.html -[flavors_doc]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/master/templates/flavors/README.md +[flavors_doc]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/templates/flavors/README.md diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md index 5f77a5a7fa8..22ba9b4007c 100644 --- a/docs/book/src/developers/development.md +++ b/docs/book/src/developers/development.md @@ -501,7 +501,7 @@ You can also customize the configuration of the CAPZ cluster (assuming that `SKI [image_pull_secrets]: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod [gettext]: https://www.gnu.org/software/gettext/ [gettextwindows]: https://mlocati.github.io/articles/gettext-iconv-windows.html -[go.mod]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/master/go.mod +[go.mod]: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/go.mod [kind]: https://sigs.k8s.io/kind [azure_cli]: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest [manifests]: /docs/manifests.md diff --git a/docs/book/src/developers/releasing.md b/docs/book/src/developers/releasing.md index 349dfa9082c..27a59b18462 100644 --- a/docs/book/src/developers/releasing.md +++ b/docs/book/src/developers/releasing.md @@ -8,10 +8,10 @@ ## Prepare branch, tag and release notes - Identify a known good commit on the main branch - - Fast-forward the release branch to the selected commit. :warning: Always release from the release branch and not from master! + - Fast-forward the release branch to the selected commit. :warning: Always release from the release branch and not from main! - `git checkout release-0.x` - `git fetch upstream` - - `git merge --ff-only upstream/master` + - `git merge --ff-only upstream/main` - `git push` - Create tag with git - `export RELEASE_TAG=v0.4.6` (the tag of the release to be cut) diff --git a/docs/book/src/topics/aad-integration.md b/docs/book/src/topics/aad-integration.md index 75b5f43a497..664a5e50abb 100644 --- a/docs/book/src/topics/aad-integration.md +++ b/docs/book/src/topics/aad-integration.md @@ -58,7 +58,7 @@ az ad app permission grant --id ${AZURE_CLIENT_APP_ID} --api ${AZURE_SERVER_APP_ ## Create the cluster -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). +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). Make sure that `AZURE_SERVER_APP_ID` is set to the ID of the server AD application created above. diff --git a/docs/book/src/topics/cloud-provider-config.md b/docs/book/src/topics/cloud-provider-config.md index 63c997e9b55..4b9f2ffc923 100644 --- a/docs/book/src/topics/cloud-provider-config.md +++ b/docs/book/src/topics/cloud-provider-config.md @@ -69,7 +69,7 @@ All cloud provider config values can be customized by creating the `${RESOURCE}- # External Cloud Provider -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). +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). After deploying the cluster, you should eventually see a set of pods like the following in a `Running` state: diff --git a/docs/book/src/topics/gpu.md b/docs/book/src/topics/gpu.md index 0c0d57ac647..ba4105a0571 100644 --- a/docs/book/src/topics/gpu.md +++ b/docs/book/src/topics/gpu.md @@ -10,7 +10,7 @@ Before you begin, be aware that: - [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 - [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. -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). +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). ## An example GPU cluster diff --git a/docs/book/src/topics/ipv6.md b/docs/book/src/topics/ipv6.md index a00293c58cc..781a24f1b0e 100644 --- a/docs/book/src/topics/ipv6.md +++ b/docs/book/src/topics/ipv6.md @@ -7,7 +7,7 @@ CAPZ enables you to create IPv6 Kubernetes clusters on Microsoft Azure. - IPv6 support is available for Kubernetes version 1.18.0 and later on Azure. - IPv6 support is in beta as of Kubernetes version 1.18 in Kubernetes community. -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). +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).