diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 095f079d6..ed5a31532 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -60,11 +60,11 @@ Help up us (if possible) reproducing the issue using minikube or kind. ## Install the ingress controller -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/baremetal/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/baremetal/deploy.yaml ## Install an application that will act as default backend (is just an echo app) -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/examples/http-svc.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/docs/examples/http-svc.yaml ## Create an ingress (please add any additional annotation required) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8b499fe8d..27d5ba4b7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,6 +28,6 @@ fixes # - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. -- [ ] I've read the [CONTRIBUTION](https://github.com/kubernetes/ingress-nginx/blob/master/CONTRIBUTING.md) guide +- [ ] I've read the [CONTRIBUTION](https://github.com/kubernetes/ingress-nginx/blob/main/CONTRIBUTING.md) guide - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a6101db9f..d121c2fa3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: push: branches: - - master + - main jobs: diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 3d180dc54..4fdff33d2 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -3,7 +3,7 @@ name: Documentation on: push: branches: - - master + - main jobs: diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml index af8b01448..a8a4c0227 100644 --- a/.github/workflows/helm.yaml +++ b/.github/workflows/helm.yaml @@ -3,7 +3,7 @@ name: Helm on: push: branches: - - master + - main jobs: diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 0c2854fa8..8dead6df3 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -21,5 +21,5 @@ steps: && make release substitutions: _GIT_TAG: "12345" - _PULL_BASE_REF: "master" + _PULL_BASE_REF: "main" _PULL_BASE_SHA: '12345' diff --git a/hack/generate-e2e-suite-doc.sh b/hack/generate-e2e-suite-doc.sh index cfcc55040..c5545945e 100755 --- a/hack/generate-e2e-suite-doc.sh +++ b/hack/generate-e2e-suite-doc.sh @@ -22,7 +22,7 @@ set -o errexit set -o nounset set -o pipefail -URL="https://github.com/kubernetes/ingress-nginx/tree/master/" +URL="https://github.com/kubernetes/ingress-nginx/tree/main/" DIR=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P) echo "