From d4d41d81d60010610d6ab408ff0181dfe82189a0 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Tue, 20 Jun 2023 09:26:31 +0100 Subject: [PATCH] Update main branch referenced in docs Signed-off-by: Marcus Noble --- docs/book/src/capi/container-image.md | 2 +- docs/book/src/capi/quickstart.md | 2 +- docs/book/src/capi/releasing.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/book/src/capi/container-image.md b/docs/book/src/capi/container-image.md index 7bcb07c0b5..e58c6ebf5c 100644 --- a/docs/book/src/capi/container-image.md +++ b/docs/book/src/capi/container-image.md @@ -57,7 +57,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v ``` - vSphere OVA - - `vsphere.json` configuration file with user and hypervisor credentials. A template of this file can be found [here](https://github.com/kubernetes-sigs/image-builder/blob/master/images/capi/packer/ova/vsphere.json) + - `vsphere.json` configuration file with user and hypervisor credentials. A template of this file can be found [here](https://github.com/kubernetes-sigs/image-builder/blob/main/images/capi/packer/ova/vsphere.json) - Docker's `--net=host` option to ensure http server starts with the host IP and not the Docker container IP. This option is Linux specific and thus implies that it can be run only from a Linux machine. diff --git a/docs/book/src/capi/quickstart.md b/docs/book/src/capi/quickstart.md index e4ad2b64a7..78b0d07ef9 100644 --- a/docs/book/src/capi/quickstart.md +++ b/docs/book/src/capi/quickstart.md @@ -11,7 +11,7 @@ To get the latest image-builder source on your machine, choose one of the follow Tarball download: ```sh -curl -L https://github.com/kubernetes-sigs/image-builder/tarball/master -o image-builder.tgz +curl -L https://github.com/kubernetes-sigs/image-builder/tarball/main -o image-builder.tgz mkdir image-builder tar xzf image-builder.tgz --strip-components 1 -C image-builder rm image-builder.tgz diff --git a/docs/book/src/capi/releasing.md b/docs/book/src/capi/releasing.md index 84255a5816..965b5bfbf7 100644 --- a/docs/book/src/capi/releasing.md +++ b/docs/book/src/capi/releasing.md @@ -8,13 +8,13 @@ Releasing image-builder is a simple process: project maintainers should be able ### Create a tag -Releases in image-builder follow [semantic versioning][semver] conventions. Currently the project tags only patch releases on the master branch. +Releases in image-builder follow [semantic versioning][semver] conventions. Currently the project tags only patch releases on the main branch. - Check out the existing branch and make sure you have the latest changes: - - `git checkout master` + - `git checkout main` - `git fetch upstream` - *This assumes you have an "upstream" git remote pointing at github.com/kubernetes-sigs/image-builder* - - `git rebase upstream/master` + - `git rebase upstream/main` - *If the HEAD commit isn't meant for release, reset to the intended commit before proceeding.* - Ensure you can sign tags: - Set up GPG, SSH, or S/MIME [at GitHub](https://docs.github.com/authentication/managing-commit-signature-verification/about-commit-signature-verification) if you haven't already.