Skip to content
This repository was archived by the owner on Jun 28, 2022. It is now read-only.

Commit cdecb4e

Browse files
authored
Change branch references from master to main (#47)
Both in ir2proxy and Contour. Signed-off-by: Nick Young <ynick@vmware.com>
1 parent 01b2cb5 commit cdecb4e

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This section describes how to build ir2proxy from source.
1919

2020
ir2proxy uses [`go modules`][2] for dependency management.
2121

22-
In order to make PRs, however, you'll need to make your own fork of the ir2proxy repo. A suggestion on how to do that is below, which will place the code in your `$GOPATH` and set you up so you can `git pull` on master and get the upstream master.
22+
In order to make PRs, however, you'll need to make your own fork of the ir2proxy repo. A suggestion on how to do that is below, which will place the code in your `$GOPATH` and set you up so you can `git pull` on main and get the upstream main.
2323

2424
#### Source setup suggestion
2525

@@ -92,8 +92,8 @@ tend to squash before opening the PR, then have PR feedback as
9292
extra commits.
9393
- Do not merge commits that don't relate to the affected issue (e.g. "Updating from PR comments", etc). Should
9494
the need to cherrypick a commit or rollback arise, it should be clear what a specific commit's purpose is.
95-
- If master has moved on, you'll need to rebase before we can merge,
96-
so merging upstream master or rebasing from upstream before opening your
95+
- If main has moved on, you'll need to rebase before we can merge,
96+
so merging upstream main or rebasing from upstream before opening your
9797
PR will probably save you some time.
9898
- PRs *must* include a `Fixes #NNNN` or `Updates #NNNN` comment. Remember that
9999
`Fixes` will close the associated issue, and `Updates` will link the PR to it.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ir2proxy [![Build Status](https://travis-ci.com/projectcontour/ir2proxy.svg?branch=master)](https://travis-ci.com/projectcontour/ir2proxy) [![Go Report Card](https://goreportcard.com/badge/github.com/projectcontour/ir2proxy)](https://goreportcard.com/report/github.com/projectcontour/ir2proxy) ![GitHub release](https://img.shields.io/github/release/projectcontour/ir2proxy.svg) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
1+
# ir2proxy [![Build Status](https://travis-ci.com/projectcontour/ir2proxy.svg?branch=main)](https://travis-ci.com/projectcontour/ir2proxy) [![Go Report Card](https://goreportcard.com/badge/github.com/projectcontour/ir2proxy)](https://goreportcard.com/report/github.com/projectcontour/ir2proxy) ![GitHub release](https://img.shields.io/github/release/projectcontour/ir2proxy.svg) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
22

33
ir2proxy is a tool to convert ir2proxy's IngressRoute resources to HTTPProxy resources.
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
The guess for the IngressRoute include path is /foo. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/master/httpproxy/#conditions-and-inclusion
1+
The guess for the IngressRoute include path is /foo. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/main/httpproxy/#conditions-and-inclusion
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Can't determine include path from single match /foo/bar. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/master/httpproxy/#conditions-and-inclusion
1+
Can't determine include path from single match /foo/bar. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/main/httpproxy/#conditions-and-inclusion

internal/translator/translate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ func IngressRouteToHTTPProxy(ir *irv1beta1.IngressRoute) (*hpv1.HTTPProxy, []str
6666
return nil, nil, errors.New("invalid IngressRoute: match clauses must share a common prefix")
6767
}
6868
if len(routePrefixes) == 1 && routePrefixes[0] != "/" {
69-
warnings = append(warnings, fmt.Sprintf("Can't determine include path from single match %s. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/master/httpproxy/#conditions-and-inclusion", routePrefixes[0]))
69+
warnings = append(warnings, fmt.Sprintf("Can't determine include path from single match %s. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/main/httpproxy/#conditions-and-inclusion", routePrefixes[0]))
7070
// Reset the largest common prefix back to '/', since we can't replace it.
7171
routeLCP = ""
7272
}
7373
if routeLCP != "" {
74-
warnings = append(warnings, fmt.Sprintf("The guess for the IngressRoute include path is %s. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/master/httpproxy/#conditions-and-inclusion", routeLCP))
74+
warnings = append(warnings, fmt.Sprintf("The guess for the IngressRoute include path is %s. HTTPProxy prefix conditions should not include the include prefix. Please check this value is correct. See https://projectcontour.io/docs/main/httpproxy/#conditions-and-inclusion", routeLCP))
7575
}
7676

7777
}

0 commit comments

Comments
 (0)