fluxcd
/
helm-controller
mirror of https://github.com/fluxcd/helm-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from fluxcd/main-branch 

Set default branch to main
This commit is contained in:
Hidde Beydals 2020-10-05 15:11:05 +02:00 committed by GitHub
parent d55f82f35f 580d9acadd
commit 6f3014a977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e.yaml vendored
View File

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

4
.github/workflows/fossa.yml vendored
View File

@ -1,9 +1,9 @@
name: FOSSA name: FOSSA
on: on:
push: push:
branches: [master] branches: [main]
pull_request: pull_request:
branches: [master] branches: [main]
jobs: jobs:
build: build:

2
.github/workflows/release.yml vendored
View File

@ -102,7 +102,7 @@ jobs:
draft: false draft: false
prerelease: true prerelease: true
body: | 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 - name: Upload artifacts
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
id: upload-release-asset id: upload-release-asset

2
README.md
View File

@ -2,7 +2,7 @@
[![e2e](https://github.com/fluxcd/helm-controller/workflows/e2e/badge.svg)](https://github.com/fluxcd/helm-controller/actions) [![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) [![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) [![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 The helm-controller is a Kubernetes operator, allowing one to declaratively

7
docs/internal/release.md
View File

@ -2,12 +2,13 @@
To release a new version the following steps should be followed: 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. will function as your release preparation branch.
1. Add an entry to the `CHANGELOG.md` for the new release and change the 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 `newTag` value in ` config/manager/kustomization.yaml` to that of the
semver release you are going to make. Commit and push your changes. 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 PR for your release branch and get it merged into `main`.
1. Create a `<next semver>` tag for the merge commit in `master` and 1. Create a `<next semver>` tag for the merge commit in `main` and
push it to remote. push it to remote.
1. Confirm CI builds and releases the newly tagged version. 1. Confirm CI builds and releases the newly tagged version.

8
docs/spec/v2alpha1/helmreleases.md
View File

@ -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 The `spec.chart.spec.sourceRef` is a reference to an object managed by
[source-controller](https://github.com/fluxcd/source-controller). When the source [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. changes, it generates a Kubernetes event that triggers a new release.
Supported source types: Supported source types:
* [HelmRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/helmrepositories.md) * [HelmRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/helmrepositories.md)
* [GitRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/gitrepositories.md) * [GitRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/gitrepositories.md)
* [Bucket](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/buckets.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`, The `HelmChart` is created in the same namespace as the `sourceRef`,
with a name matching the `HelmRelease` `<metadata.namespace>-<metadata.name>`. with a name matching the `HelmRelease` `<metadata.namespace>-<metadata.name>`.

8
docs/spec/v2beta1/helmreleases.md
View File

@ -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 The `spec.chart.spec.sourceRef` is a reference to an object managed by
[source-controller](https://github.com/fluxcd/source-controller). When the source [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. changes, it generates a Kubernetes event that triggers a new release.
Supported source types: Supported source types:
* [HelmRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/helmrepositories.md) * [HelmRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta1/helmrepositories.md)
* [GitRepository](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/gitrepositories.md) * [GitRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta1/gitrepositories.md)
* [Bucket](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1beta1/buckets.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`, The `HelmChart` is created in the same namespace as the `sourceRef`,
with a name matching the `HelmRelease` `<metadata.namespace>-<metadata.name>`. with a name matching the `HelmRelease` `<metadata.namespace>-<metadata.name>`.