vault-helm default branch is now main (#618)

Updated the circleci config to use the `main` branch, and also changed
a couple mentions in the contributing guide.
This commit is contained in:
Theron Voran 2021-09-27 21:40:09 -07:00 committed by GitHub
parent cd2059147d
commit b69e3d9276
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -77,7 +77,7 @@ jobs:
-X POST \ -X POST \
-H 'Content-Type: application/json' \ -H 'Content-Type: application/json' \
-H 'Accept: application/json' \ -H 'Accept: application/json' \
-d "{\"branch\": \"master\",\"parameters\":{\"SOURCE_REPO\": \"${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}\",\"SOURCE_TAG\": \"${CIRCLE_TAG}\"}}" \ -d "{\"branch\": \"main\",\"parameters\":{\"SOURCE_REPO\": \"${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}\",\"SOURCE_TAG\": \"${CIRCLE_TAG}\"}}" \
"${CIRCLE_ENDPOINT}/${CIRCLE_PROJECT}/pipeline" "${CIRCLE_ENDPOINT}/${CIRCLE_PROJECT}/pipeline"
- slack/status: - slack/status:
fail_only: true fail_only: true
@ -94,7 +94,7 @@ workflows:
- bats-unit-test - bats-unit-test
filters: filters:
branches: branches:
only: master only: main
update-helm-charts-index: update-helm-charts-index:
jobs: jobs:
- update-helm-charts-index: - update-helm-charts-index:

View file

@ -26,7 +26,7 @@ quickly merge or address your contributions.
* Make sure you test against the latest released version. It is possible * Make sure you test against the latest released version. It is possible
we already fixed the bug you're experiencing. Even better is if you can test we already fixed the bug you're experiencing. Even better is if you can test
against `master`, as bugs are fixed regularly but new versions are only against `main`, as bugs are fixed regularly but new versions are only
released every few months. released every few months.
* Provide steps to reproduce the issue, and if possible include the expected * Provide steps to reproduce the issue, and if possible include the expected
@ -121,7 +121,7 @@ may not be properly cleaned up. We recommend recycling the Kubernetes cluster to
start from a clean slate. start from a clean slate.
**Note:** There is a Terraform configuration in the **Note:** There is a Terraform configuration in the
[`test/terraform/`](https://github.com/hashicorp/vault-helm/tree/master/test/terraform) directory [`test/terraform/`](https://github.com/hashicorp/vault-helm/tree/main/test/terraform) directory
that can be used to quickly bring up a GKE cluster and configure that can be used to quickly bring up a GKE cluster and configure
`kubectl` and `helm` locally. This can be used to quickly spin up a test `kubectl` and `helm` locally. This can be used to quickly spin up a test
cluster for acceptance tests. Unit tests _do not_ require a running Kubernetes cluster for acceptance tests. Unit tests _do not_ require a running Kubernetes