Set default branch to main
This commit is contained in:
parent
371e54c1f3
commit
580d9acadd
|
@ -4,7 +4,7 @@ on:
|
|||
pull_request:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
|
||||
jobs:
|
||||
kind:
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
name: FOSSA
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [master]
|
||||
branches: [main]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
|
|
@ -102,7 +102,7 @@ jobs:
|
|||
draft: false
|
||||
prerelease: true
|
||||
body: |
|
||||
[CHANGELOG](https://github.com/fluxcd/helm-controller/blob/master/CHANGELOG.md)
|
||||
[CHANGELOG](https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md)
|
||||
- name: Upload artifacts
|
||||
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
|
||||
id: upload-release-asset
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
[](https://github.com/fluxcd/helm-controller/actions)
|
||||
[](https://goreportcard.com/report/github.com/fluxcd/helm-controller)
|
||||
[](https://github.com/fluxcd/helm-controller/blob/master/LICENSE)
|
||||
[](https://github.com/fluxcd/helm-controller/blob/main/LICENSE)
|
||||
[](https://github.com/fluxcd/helm-controller/releases)
|
||||
|
||||
The helm-controller is a Kubernetes operator, allowing one to declaratively
|
||||
|
|
|
@ -2,12 +2,13 @@
|
|||
|
||||
To release a new version the following steps should be followed:
|
||||
|
||||
1. Create a new branch from `master` i.e. `release-<next semver>`. This
|
||||
1. Create a `api/<next semver>` tag and push it to remote.
|
||||
1. Create a new branch from `main` i.e. `release-<next semver>`. This
|
||||
will function as your release preparation branch.
|
||||
1. Add an entry to the `CHANGELOG.md` for the new release and change the
|
||||
`newTag` value in ` config/manager/kustomization.yaml` to that of the
|
||||
semver release you are going to make. Commit and push your changes.
|
||||
1. Create a PR for your release branch and get it merged into `master`.
|
||||
1. Create a `<next semver>` tag for the merge commit in `master` and
|
||||
1. Create a PR for your release branch and get it merged into `main`.
|
||||
1. Create a `<next semver>` tag for the merge commit in `main` and
|
||||
push it to remote.
|
||||
1. Confirm CI builds and releases the newly tagged version.
|
||||
|
|
|
@ -537,14 +537,14 @@ to create a new `HelmChart` resource with the given spec.
|
|||
|
||||
The `spec.chart.spec.sourceRef` is a reference to an object managed by
|
||||
[source-controller](https://github.com/fluxcd/source-controller). When the source
|
||||
[revision](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/common.md#source-status)
|
||||
[revision](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/common.md#source-status)
|
||||
changes, it generates a Kubernetes event that triggers a new release.
|
||||
|
||||
Supported source types:
|
||||
|
||||
* [HelmRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/helmrepositories.md)
|
||||
* [GitRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/gitrepositories.md)
|
||||
* [Bucket](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/buckets.md)
|
||||
* [HelmRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/helmrepositories.md)
|
||||
* [GitRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/gitrepositories.md)
|
||||
* [Bucket](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/buckets.md)
|
||||
|
||||
The `HelmChart` is created in the same namespace as the `sourceRef`,
|
||||
with a name matching the `HelmRelease` `<metadata.namespace>-<metadata.name>`.
|
||||
|
|
|
@ -537,14 +537,14 @@ to create a new `HelmChart` resource with the given spec.
|
|||
|
||||
The `spec.chart.spec.sourceRef` is a reference to an object managed by
|
||||
[source-controller](https://github.com/fluxcd/source-controller). When the source
|
||||
[revision](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/common.md#source-status)
|
||||
[revision](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta1/common.md#source-status)
|
||||
changes, it generates a Kubernetes event that triggers a new release.
|
||||
|
||||
Supported source types:
|
||||
|
||||
* [HelmRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/helmrepositories.md)
|
||||
* [GitRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/gitrepositories.md)
|
||||
* [Bucket](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/buckets.md)
|
||||
* [HelmRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta1/helmrepositories.md)
|
||||
* [GitRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta1/gitrepositories.md)
|
||||
* [Bucket](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta1/buckets.md)
|
||||
|
||||
The `HelmChart` is created in the same namespace as the `sourceRef`,
|
||||
with a name matching the `HelmRelease` `<metadata.namespace>-<metadata.name>`.
|
||||
|
|
Loading…
Reference in New Issue