Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update main branch referenced in docs #1203

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Update main branch referenced in docs #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/book/src/capi/container-image.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/capi/quickstart.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/book/src/capi/releasing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down