Skip to content

Commit 8087796

Browse files
authored
Merge pull request #2203 from sbueringer/pr-remove-master
📖 Replace occurences of master with main
2 parents 25d6edd + 12bc315 commit 8087796

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

.github/workflows/golangci-lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
types: [opened, edited, synchronize, reopened]
55
branches:
66
- main
7-
- master
87
jobs:
98
golangci:
109
name: lint

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Documentation:
1616
- [Basic controller using builder](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/builder#example-Builder)
1717
- [Creating a manager](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/manager#example-New)
1818
- [Creating a controller](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/controller#example-New)
19-
- [Examples](https://github.com/kubernetes-sigs/controller-runtime/blob/master/examples)
20-
- [Designs](https://github.com/kubernetes-sigs/controller-runtime/blob/master/designs)
19+
- [Examples](https://github.com/kubernetes-sigs/controller-runtime/blob/main/examples)
20+
- [Designs](https://github.com/kubernetes-sigs/controller-runtime/blob/main/designs)
2121

2222
# Versioning, Maintenance, and Compatibility
2323

@@ -27,7 +27,7 @@ Users:
2727

2828
- We follow [Semantic Versioning (semver)](https://semver.org)
2929
- Use releases with your dependency management to ensure that you get compatible code
30-
- The master branch contains all the latest code, some of which may break compatibility (so "normal" `go get` is not recommended)
30+
- The main branch contains all the latest code, some of which may break compatibility (so "normal" `go get` is not recommended)
3131

3232
Contributors:
3333

RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ to create a new branch you will just need to ensure that all big fixes are cherr
1010

1111
### Create the new branch and the release tag
1212

13-
1. Create a new branch `git checkout -b release-<MAJOR.MINOR>` from master
13+
1. Create a new branch `git checkout -b release-<MAJOR.MINOR>` from main
1414
2. Push the new branch to the remote repository
1515

1616
### Now, let's generate the changelog

doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ limitations under the License.
4646
//
4747
// Frequently asked questions about using controller-runtime and designing
4848
// controllers can be found at
49-
// https://github.com/kubernetes-sigs/controller-runtime/blob/master/FAQ.md.
49+
// https://github.com/kubernetes-sigs/controller-runtime/blob/main/FAQ.md.
5050
//
5151
// # Managers
5252
//

0 commit comments

Comments
 (0)