From cdecb4eda5392cba5de4768631bb34ba13a06125 Mon Sep 17 00:00:00 2001 From: Nick Young Date: Wed, 26 Aug 2020 16:13:10 +1000 Subject: [PATCH] Change branch references from master to main (#47) Both in ir2proxy and Contour. Signed-off-by: Nick Young --- CONTRIBUTING.md | 6 +++--- README.md | 2 +- .../translator/testdata/nonroot-multiplematches/errors.txt | 2 +- .../translator/testdata/nonroot_ambiguous_prefix/errors.txt | 2 +- internal/translator/translate.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7cddec6..eb0e6c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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. diff --git a/README.md b/README.md index 5aefca4..ad1b2af 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/internal/translator/testdata/nonroot-multiplematches/errors.txt b/internal/translator/testdata/nonroot-multiplematches/errors.txt index f90877b..4569a8a 100644 --- a/internal/translator/testdata/nonroot-multiplematches/errors.txt +++ b/internal/translator/testdata/nonroot-multiplematches/errors.txt @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/internal/translator/testdata/nonroot_ambiguous_prefix/errors.txt b/internal/translator/testdata/nonroot_ambiguous_prefix/errors.txt index ea33268..03b48e8 100644 --- a/internal/translator/testdata/nonroot_ambiguous_prefix/errors.txt +++ b/internal/translator/testdata/nonroot_ambiguous_prefix/errors.txt @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/internal/translator/translate.go b/internal/translator/translate.go index 2ffae43..1f800ff 100644 --- a/internal/translator/translate.go +++ b/internal/translator/translate.go @@ -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)) } }