Update ci main (#7351)

* update actions, master to main:

* update cloud build and scripts
This commit is contained in:
James Strong 2021-07-14 15:14:40 -04:00 committed by GitHub
parent 24f99c8466
commit 1de9a24b28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions

View file

@ -60,11 +60,11 @@ Help up us (if possible) reproducing the issue using minikube or kind.
## Install the ingress controller ## 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) ## 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) ## Create an ingress (please add any additional annotation required)

View file

@ -28,6 +28,6 @@ fixes #
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My change requires a change to the documentation. - [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly. - [ ] 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. - [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed. - [ ] All new and existing tests passed.

View file

@ -7,7 +7,7 @@ on:
push: push:
branches: branches:
- master - main
jobs: jobs:

View file

@ -3,7 +3,7 @@ name: Documentation
on: on:
push: push:
branches: branches:
- master - main
jobs: jobs:

View file

@ -3,7 +3,7 @@ name: Helm
on: on:
push: push:
branches: branches:
- master - main
jobs: jobs:

View file

@ -21,5 +21,5 @@ steps:
&& make release && make release
substitutions: substitutions:
_GIT_TAG: "12345" _GIT_TAG: "12345"
_PULL_BASE_REF: "master" _PULL_BASE_REF: "main"
_PULL_BASE_SHA: '12345' _PULL_BASE_SHA: '12345'

View file

@ -22,7 +22,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail 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) DIR=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
echo " echo "