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

Commit

Permalink
Change branch references from master to main (#47)
Browse files Browse the repository at this point in the history
Both in ir2proxy and Contour.

Signed-off-by: Nick Young <[email protected]>
  • Loading branch information
Nick Young authored Aug 26, 2020
1 parent 01b2cb5 commit cdecb4e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This section describes how to build ir2proxy from source.

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

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.
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.

#### Source setup suggestion

Expand Down Expand Up @@ -92,8 +92,8 @@ tend to squash before opening the PR, then have PR feedback as
extra commits.
- Do not merge commits that don't relate to the affected issue (e.g. "Updating from PR comments", etc). Should
the need to cherrypick a commit or rollback arise, it should be clear what a specific commit's purpose is.
- If master has moved on, you'll need to rebase before we can merge,
so merging upstream master or rebasing from upstream before opening your
- If main has moved on, you'll need to rebase before we can merge,
so merging upstream main or rebasing from upstream before opening your
PR will probably save you some time.
- PRs *must* include a `Fixes #NNNN` or `Updates #NNNN` comment. Remember that
`Fixes` will close the associated issue, and `Updates` will link the PR to it.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 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)
# 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)

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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
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
Original file line number Diff line number Diff line change
@@ -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
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
4 changes: 2 additions & 2 deletions internal/translator/translate.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ func IngressRouteToHTTPProxy(ir *irv1beta1.IngressRoute) (*hpv1.HTTPProxy, []str
return nil, nil, errors.New("invalid IngressRoute: match clauses must share a common prefix")
}
if len(routePrefixes) == 1 && routePrefixes[0] != "/" {
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]))
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]))
// Reset the largest common prefix back to '/', since we can't replace it.
routeLCP = ""
}
if routeLCP != "" {
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))
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))
}

}
Expand Down

0 comments on commit cdecb4e

Please sign in to comment.