Replace occurences of master with main

k8s-infra-cherrypick-robot · Feb 16, 2023 · 12bc315 · 12bc315
1 parent 25d6edd
commit 12bc315
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -4,7 +4,6 @@ on:
     types: [opened, edited, synchronize, reopened]
     branches:
       - main
-      - master
 jobs:
   golangci:
     name: lint

diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@ Documentation:
 - [Basic controller using builder](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/builder#example-Builder)
 - [Creating a manager](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/manager#example-New)
 - [Creating a controller](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/controller#example-New)
-- [Examples](https://github.com/kubernetes-sigs/controller-runtime/blob/master/examples)
-- [Designs](https://github.com/kubernetes-sigs/controller-runtime/blob/master/designs)
+- [Examples](https://github.com/kubernetes-sigs/controller-runtime/blob/main/examples)
+- [Designs](https://github.com/kubernetes-sigs/controller-runtime/blob/main/designs)
 
 # Versioning, Maintenance, and Compatibility
 
@@ -27,7 +27,7 @@ Users:
 
 - We follow [Semantic Versioning (semver)](https://semver.org)
 - Use releases with your dependency management to ensure that you get compatible code
-- The master branch contains all the latest code, some of which may break compatibility (so "normal" `go get` is not recommended)
+- The main branch contains all the latest code, some of which may break compatibility (so "normal" `go get` is not recommended)
 
 Contributors:
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -10,7 +10,7 @@ to create a new branch you will just need to ensure that all big fixes are cherr
 
 ### Create the new branch and the release tag
 
-1. Create a new branch `git checkout -b release-<MAJOR.MINOR>` from master
+1. Create a new branch `git checkout -b release-<MAJOR.MINOR>` from main
 2. Push the new branch to the remote repository
 
 ### Now, let's generate the changelog

diff --git a/doc.go b/doc.go
@@ -46,7 +46,7 @@ limitations under the License.
 //
 // Frequently asked questions about using controller-runtime and designing
 // controllers can be found at
-// https://github.com/kubernetes-sigs/controller-runtime/blob/master/FAQ.md.
+// https://github.com/kubernetes-sigs/controller-runtime/blob/main/FAQ.md.
 //
 // # Managers
 //