diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 8295e3a..fef60fb 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: kind: diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 5566d22..ca9fcfc 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -1,9 +1,9 @@ name: FOSSA on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 858168c..e36027c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/README.md b/README.md index 93a111c..be70acf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![e2e](https://github.com/fluxcd/helm-controller/workflows/e2e/badge.svg)](https://github.com/fluxcd/helm-controller/actions) [![report](https://goreportcard.com/badge/github.com/fluxcd/helm-controller)](https://goreportcard.com/report/github.com/fluxcd/helm-controller) -[![license](https://img.shields.io/github/license/fluxcd/helm-controller.svg)](https://github.com/fluxcd/helm-controller/blob/master/LICENSE) +[![license](https://img.shields.io/github/license/fluxcd/helm-controller.svg)](https://github.com/fluxcd/helm-controller/blob/main/LICENSE) [![release](https://img.shields.io/github/release/fluxcd/helm-controller/all.svg)](https://github.com/fluxcd/helm-controller/releases) The helm-controller is a Kubernetes operator, allowing one to declaratively diff --git a/docs/internal/release.md b/docs/internal/release.md index a3ed9a7..3e8e9c1 100644 --- a/docs/internal/release.md +++ b/docs/internal/release.md @@ -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-`. This +1. Create a `api/` tag and push it to remote. +1. Create a new branch from `main` i.e. `release-`. 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 `` 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 `` tag for the merge commit in `main` and push it to remote. 1. Confirm CI builds and releases the newly tagged version. diff --git a/docs/spec/v2alpha1/helmreleases.md b/docs/spec/v2alpha1/helmreleases.md index 931ffb0..4f5fc91 100644 --- a/docs/spec/v2alpha1/helmreleases.md +++ b/docs/spec/v2alpha1/helmreleases.md @@ -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` `-`. diff --git a/docs/spec/v2beta1/helmreleases.md b/docs/spec/v2beta1/helmreleases.md index 238bc6a..cdd1b40 100644 --- a/docs/spec/v2beta1/helmreleases.md +++ b/docs/spec/v2beta1/helmreleases.md @@ -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` `-`.