Skip to content

Commit 6372f4f

Browse files
committed
chore: updates for default branch rename
1 parent bcfe3da commit 6372f4f

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

CHANGELOG.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ The following changes have been made since v0.3.0:
154154
GEP added in [#749](https://github.com/kubernetes-sigs/gateway-api/pull/749).
155155
Implemented in [#768](https://github.com/kubernetes-sigs/gateway-api/pull/768).
156156

157-
[GEP-851](https://github.com/kubernetes-sigs/gateway-api/blob/master/site-src/geps/gep-851.md)
157+
[GEP-851](https://github.com/kubernetes-sigs/gateway-api/blob/main/site-src/geps/gep-851.md)
158158
was a follow up on this change that allowed multiple Certificate Refs per
159159
Gateway Listener. This was implemented in
160160
[#852](https://github.com/kubernetes-sigs/gateway-api/pull/852).
@@ -169,7 +169,7 @@ The following changes have been made since v0.3.0:
169169
### Small Changes
170170
* Extension points within match blocks from all Routes have been removed
171171
[#829](https://github.com/kubernetes-sigs/gateway-api/pull/829). Implements
172-
[GEP-820](https://github.com/kubernetes-sigs/gateway-api/blob/master/site-src/geps/gep-820.md).
172+
[GEP-820](https://github.com/kubernetes-sigs/gateway-api/blob/main/site-src/geps/gep-820.md).
173173
These extension points have been removed because they are currently not used,
174174
are poorly understood, and we don't have good use cases for them. We may
175175
consider re-adding them in the future.
@@ -316,11 +316,11 @@ The following changes have been made since v0.4.0-rc1:
316316
### GEP implementations
317317
* Replace `CertificateRef` field with `CertificateRefs` in `GatewayTLSConfig`.
318318
[#852](https://github.com/kubernetes-sigs/gateway-api/pull/852). This implements
319-
[GEP-851](https://github.com/kubernetes-sigs/gateway-api/blob/master/site-src/geps/gep-851.md),
319+
[GEP-851](https://github.com/kubernetes-sigs/gateway-api/blob/main/site-src/geps/gep-851.md),
320320
Allow Multiple Certificate Refs per Gateway Listener.
321321
* Extension points within match blocks from all Routes have been removed
322322
[#829](https://github.com/kubernetes-sigs/gateway-api/pull/829). Implements
323-
[GEP-820](https://github.com/kubernetes-sigs/gateway-api/blob/master/site-src/geps/gep-820.md).
323+
[GEP-820](https://github.com/kubernetes-sigs/gateway-api/blob/main/site-src/geps/gep-820.md).
324324
These extension points have been removed because they are currently not used,
325325
are poorly understood, and we don't have good use cases for them. We may
326326
consider re-adding them in the future.

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export GIT_TAG ?= dev
3131

3232
# Prow gives this the reference it's called on.
3333
# The test-infra config job only allows our cloudbuild to
34-
# be called on `master` and semver tags, so this will be
34+
# be called on `main` and semver tags, so this will be
3535
# set to one of those things.
36-
export BASE_REF ?= master
36+
export BASE_REF ?= main
3737

3838
# The commit hash of the current checkout
39-
# Used to pass a binary version for master,
39+
# Used to pass a binary version for main,
4040
# overridden to semver for tagged versions.
4141
# Cloudbuild will set this in the environment to the
4242
# commit SHA, since the Prow does not seem to check out

OWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
2-
# See the OWNERS_ALIASES file at https://github.com/kubernetes-sigs/gateway-api/blob/master/OWNERS_ALIASES for a list of members for each alias.
2+
# See the OWNERS_ALIASES file at https://github.com/kubernetes-sigs/gateway-api/blob/main/OWNERS_ALIASES for a list of members for each alias.
33

44
approvers:
55
- sig-network-leads

OWNERS_ALIASES

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# This file should be kept in sync with k/org.
33

44
aliases:
5-
# Reference: https://github.com/kubernetes/org/blob/master/OWNERS_ALIASES
5+
# Reference: https://github.com/kubernetes/org/blob/main/OWNERS_ALIASES
66
sig-network-leads:
77
- caseydavenport
88
- dcbw
99
- thockin
1010

11-
# Reference: https://github.com/kubernetes/org/blob/master/config/kubernetes-sigs/sig-network/teams.yaml
11+
# Reference: https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-network/teams.yaml
1212
gateway-api-admins:
1313
- bowei
1414
- thockin

RELEASE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ documentation].
1717
## Releasing a new version
1818

1919
- Write the [changelog](CHANGELOG.md) with user-visible API changes. This must
20-
go through the regular PR review process and get merged into the `master` branch.
20+
go through the regular PR review process and get merged into the `main` branch.
2121
Approval of the PR indicates community consensus for a new release.
2222

2323
The following steps must be done by one of the [Gateway API maintainers][gateway-api-team]:
@@ -37,5 +37,5 @@ For all releases:
3737
the Github release.
3838

3939
[release]: https://gateway-api.sigs.k8s.io/references/releases/
40-
[gateway-api-team]: https://github.com/kubernetes/org/blob/master/config/kubernetes-sigs/sig-network/teams.yaml
40+
[gateway-api-team]: https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-network/teams.yaml
4141

cloudbuild.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ substitutions:
2121
# can be used as a substitution
2222
_GIT_TAG: '12345'
2323
# _PULL_BASE_REF will contain the ref that was pushed to to trigger this build -
24-
# a branch like 'master' or 'release-0.2', or a tag like 'v0.2'.
25-
_PULL_BASE_REF: 'master'
24+
# a branch like 'main' or 'release-0.2', or a tag like 'v0.2'.
25+
_PULL_BASE_REF: 'main'
2626
# _PULL_BASE_SHA will contain the Git SHA of the commit that was pushed to trigger this build.
2727
_PULL_BASE_SHA: 'abcdef'

hack/build-and-push.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ then
4444
exit 1
4545
fi
4646

47-
# If our base ref == "master" then we will tag :latest.
47+
# If our base ref == "main" then we will tag :latest.
4848
VERSION_TAG=latest
4949

5050
# We tag the go binary with the git-based tag by default
5151
BINARY_TAG=$GIT_TAG
5252

5353
# $BASE_REF has only two things that it can be set to by cloudbuild and Prow,
54-
# `master`, or a semver tag.
54+
# `main`, or a semver tag.
5555
# This is controlled by k8s.io/test-infra/config/jobs/image-pushing/k8s-staging-gateway-api.yaml.
56-
if [[ "${BASE_REF}" != "master" ]]
56+
if [[ "${BASE_REF}" != "main" ]]
5757
then
5858
# Since we know this is built from a tag or release branch, we can set the VERSION_TAG
5959
VERSION_TAG="${BASE_REF}"

mkdocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ theme:
1313
- search.highlight
1414
- navigation.tabs
1515
- navigation.top
16-
edit_uri: edit/master/site-src/
16+
edit_uri: edit/main/site-src/
1717
plugins:
1818
- search
1919
- awesome-pages

netlify.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66

77
# Standard Netlify redirects
88
[[redirects]]
9-
from = "https://master--kubernetes-sigs-gateway-api.netlify.com/*"
10-
to = "https://master.gateway-api.sigs.k8s.io/:splat"
9+
from = "https://main--kubernetes-sigs-gateway-api.netlify.com/*"
10+
to = "https://main.gateway-api.sigs.k8s.io/:splat"
1111
status = 301
1212
force = true
1313

1414
# HTTP-to-HTTPS rules
1515
[[redirects]]
16-
from = "http://master.gateway-api.sigs.k8s.io/*"
17-
to = "https://master.gateway-api.sigs.k8s.io/:splat"
16+
from = "http://main.gateway-api.sigs.k8s.io/*"
17+
to = "https://main.gateway-api.sigs.k8s.io/:splat"
1818
status = 301
1919
force = true
2020

2121
[[redirects]]
22-
from = "http://master--kubernetes-sigs-gateway-api.netlify.com/*"
23-
to = "http://master.gateway-api.sigs.k8s.io/:splat"
22+
from = "http://main--kubernetes-sigs-gateway-api.netlify.com/*"
23+
to = "http://main.gateway-api.sigs.k8s.io/:splat"
2424
status = 301
2525
force = true

site-src/concepts/versioning.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ experimental field.
134134

135135
## Out of Scope
136136
### Unreleased APIs
137-
This project will have frequent updates to the master branch. There are no
138-
compatibility guarantees associated with code in any branch, including master,
137+
This project will have frequent updates to the main branch. There are no
138+
compatibility guarantees associated with code in any branch, including main,
139139
until it has been released. For example, changes may be reverted before a
140140
release is published. For the best results, use the latest published release of
141141
this project.

0 commit comments

Comments
 (0)