Skip to content

Commit

Permalink
Merge pull request kubevirt#5823 from dhiller/change-default-branch-t…
Browse files Browse the repository at this point in the history
…o-main

Set default branch to main
  • Loading branch information
dhiller authored Jun 18, 2021
2 parents 099be90 + 3a3cd5f commit 7b2b444
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# KubeVirt

[![Build Status](https://travis-ci.org/kubevirt/kubevirt.svg?branch=master)](https://travis-ci.org/kubevirt/kubevirt)
[![Build Status](https://travis-ci.org/kubevirt/kubevirt.svg?branch=main)](https://travis-ci.org/kubevirt/kubevirt)
[![Go Report Card](https://goreportcard.com/badge/github.com/kubevirt/kubevirt)](https://goreportcard.com/report/github.com/kubevirt/kubevirt)
[![Licensed under Apache License version 2.0](https://img.shields.io/github/license/kubevirt/kubevirt.svg)](https://www.apache.org/licenses/LICENSE-2.0)
[![Coverage Status](https://img.shields.io/coveralls/kubevirt/kubevirt/master.svg)](https://coveralls.io/github/kubevirt/kubevirt?branch=master)
[![Coverage Status](https://img.shields.io/coveralls/kubevirt/kubevirt/main.svg)](https://coveralls.io/github/kubevirt/kubevirt?branch=main)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3203/badge)](https://bestpractices.coreinfrastructure.org/projects/3203)
[![Visit our Slack channel](https://img.shields.io/badge/slack-@kubernetes/kubevirt--dev-40abb8.svg?logo=slack)](https://kubernetes.slack.com/?redir=%2Farchives%2FC0163DT0R8X)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fkubevirt%2Fkubevirt.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fkubevirt%2Fkubevirt?ref=badge_shield)
Expand Down Expand Up @@ -59,7 +59,7 @@ Once you have the basics, you can learn more about how to run KubeVirt and its n
# To start developing KubeVirt

To set up a development environment please read our
[Getting Started Guide](docs/getting-started.md). To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/master/CONTRIBUTING.md).
[Getting Started Guide](docs/getting-started.md). To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/main/CONTRIBUTING.md).

You can learn more about how KubeVirt is designed (and why it is that way),
and learn more about the major components by taking a look at
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion automation/repeated_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ usage: [NUM_TESTS=x] [NEW_TESTS=test1_test|...|testn_test] $0 [kubevirtci_provid
NEW_TESTS what set of tests to run, defaults to all test files added or changed since
last merge commit
TARGET_COMMIT the commit id to use when fetching the changed test files
note: leaving TARGET_COMMIT empty only works if on a git branch different from master.
note: leaving TARGET_COMMIT empty only works if on a git branch different from main.
If /clonerefs is at work you need to provide a target commit, as then the latest commit is a
merge commit (resulting in no changes detected)
Expand Down
2 changes: 1 addition & 1 deletion containerimages/container-disk-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ We can do that with `virt-sysprep`:
Once the image is ready it is necessary to convert it to
container image with `kubevirt/container-disk-v1alpha` layer,
so KubeVirt VM's can consume it according to
https://github.com/kubevirt/kubevirt/blob/master/docs/container-register-disks.md
https://github.com/kubevirt/kubevirt/blob/main/docs/container-register-disks.md

```bash
cat > Dockerfile <<EOF
Expand Down
2 changes: 1 addition & 1 deletion docs/devel/host-devices-and-device-plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

KubeVirt provides a mechanism for assigning host devices to a virtual machine. This mechanism is generic and allows various types of PCI devices, such as GPU or any other devices attached to a PCI bus, to be assigned. It also allows Mediated devices, such as pre-configured virtual GPUs to be assigned using the same mechanism.

NOTE: This document doesn't cover KubeVirt's [SR-IOV Support](https://github.com/kubevirt/kubevirt/blob/master/docs/sriov.md).
NOTE: This document doesn't cover KubeVirt's [SR-IOV Support](https://github.com/kubevirt/kubevirt/blob/main/docs/sriov.md).
### Permitting Host Devices to be used in the cluster:

Administrators can control which host devices will be permitted for use in the cluster.
Expand Down
2 changes: 1 addition & 1 deletion docs/devel/networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Similar to the [bridge bind mechanism](#bridge-binding-mechanism), triggering
the masquerade `BindMechanism` requires a VMI configuration featuring a
network with the `masquerade` interface type. KubeVirt provides an example of
a
[fedora based VMI](https://github.com/kubevirt/kubevirt/blob/master/examples/vmi-masquerade.yaml)
[fedora based VMI](https://github.com/kubevirt/kubevirt/blob/main/examples/vmi-masquerade.yaml)
in the project's examples folder.

The masquerade bind mechanism has plenty in common with bridge binding; both
Expand Down
4 changes: 2 additions & 2 deletions docs/devel/storage.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Getting started with storage

This document assumes you have a working [development environment](https://github.com/kubevirt/kubevirt/blob/master/docs/getting-started.md).
This document assumes you have a working [development environment](https://github.com/kubevirt/kubevirt/blob/main/docs/getting-started.md).


**We are using hostPath PVs, which are NOT suitable for a production environment, this document assumes you are setting up a SINGLE node development environment.**
Expand Down Expand Up @@ -102,4 +102,4 @@ spec:
status: {}
```
You can now use the steps described in the [development getting started guide](https://github.com/kubevirt/kubevirt/blob/master/docs/getting-started.md) to connect a VNC console to it.
You can now use the steps described in the [development getting started guide](https://github.com/kubevirt/kubevirt/blob/main/docs/getting-started.md) to connect a VNC console to it.
2 changes: 1 addition & 1 deletion hack/autobump-generic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ git push -f "https://${user}@github.com/${user}/kubevirt.git" HEAD:autoupdate-$@
echo "Creating PR to merge ${user}:autoupdate into master..." >&2
pr-creator \
--github-token-path="${token}" \
--org=kubevirt --repo=kubevirt --branch=master \
--org=kubevirt --repo=kubevirt --branch=main \
--title="${title}" --match-title="${title}" \
--body="Automatic run of \"$@\". Please review" \
--source="${user}":autoupdate-$@ \
Expand Down
2 changes: 1 addition & 1 deletion hack/autobump-kubevirtci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ git push -f "https://${user}@github.com/${user}/kubevirt.git" HEAD:kubevirtci
echo "Creating PR to merge ${user}:kubevirtci into master..." >&2
pr-creator \
--github-token-path="${token}" \
--org=kubevirt --repo=kubevirt --branch=master \
--org=kubevirt --repo=kubevirt --branch=main \
--title="${title}" --match-title="Run hack/bump-kubevirtci.sh" \
--body="Automatic kubevirtci update to ${kubevirtci_git_hash}. Please review" \
--source="${user}":kubevirtci \
Expand Down
4 changes: 2 additions & 2 deletions hack/publish-staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ if [ -n "${DOCKER_TAG}" ]; then
TARGET_TAG="$DOCKER_TAG"
fi

# if we are not on master and there is no tag, do nothing
if [ -z "${TARGET_TAG}" ] && [ "${TARGET_BRANCH}" != "master" ]; then
# if we are not on default branch and there is no tag, do nothing
if [ -z "${TARGET_TAG}" ] && [ "${TARGET_BRANCH}" != "main" ]; then
echo "not on a tag and not on master branch, nothing to do."
exit 0
fi
Expand Down
8 changes: 4 additions & 4 deletions manifests/generated/operator-csv.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ spec:
# Start developing KubeVirt

To set up a development environment please read our
[Getting Started Guide](https://github.com/kubevirt/kubevirt/blob/master/docs/getting-started.md).
To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/master/CONTRIBUTING.md).
[Getting Started Guide](https://github.com/kubevirt/kubevirt/blob/main/docs/getting-started.md).
To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/main/CONTRIBUTING.md).

You can learn more about how KubeVirt is designed (and why it is that way),
and learn more about the major components by taking a look at our developer documentation:

* [Architecture](https://github.com/kubevirt/kubevirt/blob/master/docs/architecture.md) - High-level view on the architecture
* [Components](https://github.com/kubevirt/kubevirt/blob/master/docs/components.md) - Detailed look at all components
* [Architecture](https://github.com/kubevirt/kubevirt/blob/main/docs/architecture.md) - High-level view on the architecture
* [Components](https://github.com/kubevirt/kubevirt/blob/main/docs/components.md) - Detailed look at all components
* [API Reference](https://kubevirt.io/api-reference/)

# Community
Expand Down
8 changes: 4 additions & 4 deletions pkg/virt-operator/resource/generate/csv/csv.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ As of today KubeVirt can be used to declaratively
# Start developing KubeVirt
To set up a development environment please read our
[Getting Started Guide](https://github.com/kubevirt/kubevirt/blob/master/docs/getting-started.md).
To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/master/CONTRIBUTING.md).
[Getting Started Guide](https://github.com/kubevirt/kubevirt/blob/main/docs/getting-started.md).
To learn how to contribute, please read our [contribution guide](https://github.com/kubevirt/kubevirt/blob/main/CONTRIBUTING.md).
You can learn more about how KubeVirt is designed (and why it is that way),
and learn more about the major components by taking a look at our developer documentation:
* [Architecture](https://github.com/kubevirt/kubevirt/blob/master/docs/architecture.md) - High-level view on the architecture
* [Components](https://github.com/kubevirt/kubevirt/blob/master/docs/components.md) - Detailed look at all components
* [Architecture](https://github.com/kubevirt/kubevirt/blob/main/docs/architecture.md) - High-level view on the architecture
* [Components](https://github.com/kubevirt/kubevirt/blob/main/docs/components.md) - Detailed look at all components
* [API Reference](https://kubevirt.io/api-reference/)
# Community
Expand Down
4 changes: 2 additions & 2 deletions staging/src/kubevirt.io/client-go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Go clients for talking to [KubeVirt](https://github.com/kubevirt/kubevirt).
please refer to some of [examples here](examples/README.md)

-----
KubeVirt client-go is maintained at https://github.com/kubevirt/kubevirt/tree/master/staging/src/kubevirt.io/client-go.
The master branch of this repository is updated on every PR merge, release tags are pushed on every release of KubeVirt.
KubeVirt client-go is maintained at https://github.com/kubevirt/kubevirt/tree/main/staging/src/kubevirt.io/client-go.
The main branch of this repository is updated on every PR merge, release tags are pushed on every release of KubeVirt.

## License

Expand Down

0 comments on commit 7b2b444

Please sign in to comment.