Set default branch to main

This commit is contained in:
stefanprodan 2020-10-05 15:23:19 +03:00
parent 89781b049c
commit d15726935a
6 changed files with 11 additions and 11 deletions

View File

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

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:

View File

@ -102,7 +102,7 @@ jobs:
draft: false draft: false
prerelease: true prerelease: true
body: | body: |
[CHANGELOG](https://github.com/fluxcd/kustomize-controller/blob/master/CHANGELOG.md) [CHANGELOG](https://github.com/fluxcd/kustomize-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

View File

@ -82,7 +82,7 @@ of kustomization objects.
This prerelease comes with improvements to the alerting system. This prerelease comes with improvements to the alerting system.
The reconciliation events can be forwarded to notification controller The reconciliation events can be forwarded to notification controller
and alerting can be configured for Slack, MS Teams, Discord and Rocket chat and alerting can be configured for Slack, MS Teams, Discord and Rocket chat
using the [notification.fluxcd.io API](https://github.com/fluxcd/notification-controller/tree/master/docs/spec). using the [notification.fluxcd.io API](https://github.com/fluxcd/notification-controller/tree/main/docs/spec).
## 0.0.1 (2020-06-24) ## 0.0.1 (2020-06-24)
@ -151,9 +151,9 @@ The controller design and motivation can be found at
## 0.0.1-alpha.2 (2020-04-21) ## 0.0.1-alpha.2 (2020-04-21)
This alpha release introduces the This alpha release introduces the
[Profile CRD](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/v1alpha1/profile.md) [Profile CRD](https://github.com/fluxcd/kustomize-controller/blob/main/docs/spec/v1alpha1/profile.md)
that allows grouping that allows grouping
[Kustomization](https://github.com/fluxcd/kustomize-controller/blob/master/docs/spec/v1alpha1/kustomization.md) [Kustomization](https://github.com/fluxcd/kustomize-controller/blob/main/docs/spec/v1alpha1/kustomization.md)
objects and defining a common behavior for them. objects and defining a common behavior for them.
The v1alpha1 profiles can be used for The v1alpha1 profiles can be used for
[configuring Slack and Discord alerting](https://github.com/fluxcd/kustomize-controller/tree/v0.0.1-alpha.2#configure-alerting). [configuring Slack and Discord alerting](https://github.com/fluxcd/kustomize-controller/tree/v0.0.1-alpha.2#configure-alerting).

View File

@ -2,7 +2,7 @@
[![e2e](https://github.com/fluxcd/kustomize-controller/workflows/e2e/badge.svg)](https://github.com/fluxcd/kustomize-controller/actions) [![e2e](https://github.com/fluxcd/kustomize-controller/workflows/e2e/badge.svg)](https://github.com/fluxcd/kustomize-controller/actions)
[![report](https://goreportcard.com/badge/github.com/fluxcd/kustomize-controller)](https://goreportcard.com/report/github.com/fluxcd/kustomize-controller) [![report](https://goreportcard.com/badge/github.com/fluxcd/kustomize-controller)](https://goreportcard.com/report/github.com/fluxcd/kustomize-controller)
[![license](https://img.shields.io/github/license/fluxcd/kustomize-controller.svg)](https://github.com/fluxcd/kustomize-controller/blob/master/LICENSE) [![license](https://img.shields.io/github/license/fluxcd/kustomize-controller.svg)](https://github.com/fluxcd/kustomize-controller/blob/main/LICENSE)
[![release](https://img.shields.io/github/release/fluxcd/kustomize-controller/all.svg)](https://github.com/fluxcd/kustomize-controller/releases) [![release](https://img.shields.io/github/release/fluxcd/kustomize-controller/all.svg)](https://github.com/fluxcd/kustomize-controller/releases)
The kustomize-controller is a Kubernetes operator, specialized in running The kustomize-controller is a Kubernetes operator, specialized in running

View File

@ -3,13 +3,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 `api/<next semver>` tag and push it to remote. 1. Create a `api/<next semver>` tag and push it to remote.
1. Create a new branch from `master` i.e. `release-<next semver>`. This 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. Update the `github.com/fluxcd/kustomize-controller/api` version in `go.mod` 1. Update the `github.com/fluxcd/kustomize-controller/api` version in `go.mod`
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.