Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Bump chart to 0.16.1 (#288)
Browse files Browse the repository at this point in the history
* chore: Bump versions following v1.3.0 release

* chore: Update readme

* chore: Bump to 0.15.0

* chore: Bump chart to 0.16.1
  • Loading branch information
gracedo authored Feb 26, 2021
1 parent d26f7c5 commit 1d15775
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
19 changes: 12 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ This is a [kubernetes addon](https://github.com/mesosphere/kubeaddons) repositor

This [KEP](https://github.com/mesosphere/ksphere-platform/blob/master/keps/sig-ksphere-catalog/20200818-remove-revisions.md) changed the way we handle revision, which enables this repository to only maintain one revision per branch and removes the need to keep a flat hierarchy on master.

Kommander currently is supported in three different versions, which are reporesented by their respective branches:
Kommander currently is supported in three different versions, which are represented by their respective branches:

- 1.3 being developed on `master` branch
- 1.4 being developed on `master` branch
- 1.3 living on `1.3.x` branch
- 1.2 living on `1.2.x` branch
- 1.1 living on `1.1.x` branch
- 1.0 living on `1.0.x` branch
Expand Down Expand Up @@ -46,17 +47,21 @@ When a major issue in "beta 3" is found on SOAK, we will follow the steps above

### Prepare Minor GA Release / Branch off maintenance branch

New pre-releases mainly happen on master branch, at some point a `[0-9].[0-9].x` maintenance branch is created for to prepare the GA release of a minor version.
New pre-releases mainly happen on master branch, at some point a `[0-9].[0-9].x` maintenance branch is created to prepare the GA release of a minor version.

1. fetch latest repo state: `git fetch` and make sure you're on `master`
1. create new `[0-9].[0-9].x` branch for that minor release: e.g. `git checkout -b 1.1.x`. that way future updates have an easy target and master can carry on with the next minor version.
1. in order to allow backports to that newly reated minor version, make sure that the charts minor version also is bumped.
1. in order to allow backports to that newly created minor version, make sure that the chart's minor version also is bumped.
1. to make it easy for fellow colleagues, rename the existing directory on `master` (e.g. `1.1` -> `1.2`) and update the addons metadata (appversion & revision)
1. update `mergebot-config.json` on `master` to add a new line for the new stable branch and update the `master` mapping to the next release

From there on, its very similar to releases from `master` branch, there might be a couple RCs before the actual GA tag is cut.
From there on, it's very similar to releases from `master` branch, there might be a couple RCs before the actual GA tag is cut. When the time comes to cut the GA release, promote the latest RC tags to GA tags: e.g. `v1.3.0` and corresponding stable tags `stable-1.17-1.3.0`, `stable-1.18-1.3.0`, `stable-1.19-1.3.0`.

There is no need to merge back `[0-9].[0-9].x` branches into master since we don't need to maintain a flat history anymore.

#### Release notes
TBD

### Dealing with previously released stable versions

Sometimes we might need to push a fix for an older version, in these cases we need to use the `[0-9].[0-9].x` branch for these versions. E.g. in order to be able to push "Kommander 1.0.1" after `master` already is in a WIP "1.1.x" state, we have `1.0.x` branch to release `v1.0.1` tag.
Expand All @@ -65,7 +70,7 @@ Sometimes we might need to push a fix for an older version, in these cases we ne

1. fetch latest repo state: `git fetch`
1. checkout respective stable branch: e.g. `git checkout 1.0.x`
1. apply tag: e.g. `git tag v1.0.1 && git push origin v1.0.1`
1. apply tags: e.g. `git tag v1.0.1 && git push origin v1.0.1` along with corresponding `stable` tags
1. update `mergebot-config.json` on `master` and set its version to the next patch release

There is no need to merge back `[0-9].[0-9].x` branches into master since we dont need to maintain a flat history anymore.
There is no need to merge back `[0-9].[0-9].x` branches into master since we don't need to maintain a flat history anymore.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ metadata:
# This was originally added to support the PVC's needed for the Kubecost subcomponent.
kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true"
annotations:
catalog.kubeaddons.mesosphere.io/addon-revision: "1.3.0-40"
appversion.kubeaddons.mesosphere.io/kommander: "1.3.0"
catalog.kubeaddons.mesosphere.io/addon-revision: "1.4.0-1"
appversion.kubeaddons.mesosphere.io/kommander: "1.4.0-beta.0"
endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander/ui
appversion.kubeaddons.mesosphere.io/thanos: 0.3.21
appversion.kubeaddons.mesosphere.io/karma: 1.4.1
Expand All @@ -21,7 +21,7 @@ metadata:
docs.kubeaddons.mesosphere.io/thanos: "https://thanos.io/getting-started.md/"
docs.kubeaddons.mesosphere.io/karma: "https://github.com/prymitive/karma"
docs.kubeaddons.mesosphere.io/kommander-grafana: "https://grafana.com/docs/"
values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/6e1079b/stable/kommander/values.yaml"
values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/44e4931/stable/kommander/values.yaml"
spec:
namespace: kommander
kubernetes:
Expand All @@ -46,7 +46,7 @@ spec:
chartReference:
chart: kommander
repo: https://mesosphere.github.io/charts/stable
version: 0.13.35
version: 0.16.1
values: |
---
kubecost:
Expand Down

0 comments on commit 1d15775

Please sign in to comment.