From c74795f1c816699b5b606d3fd1ab8613124c0da4 Mon Sep 17 00:00:00 2001
From: David Tuite <dtuite@gmail.com>
Date: Thu, 16 Jul 2020 14:23:59 +0100
Subject: [PATCH] Bump: ChartVersion 0.11.8. AppVersion 0.11.8

---
 bin/bump_app.sh           |  2 --
 bin/bump_app_and_chart.sh | 19 +++++++++++++++++++
 bin/release.sh            |  3 +--
 helm_chart/Chart.yaml     |  4 ++--
 helm_chart/values.yaml    |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100755 bin/bump_app_and_chart.sh

diff --git a/bin/bump_app.sh b/bin/bump_app.sh
index ed9a3be..c59c807 100755
--- a/bin/bump_app.sh
+++ b/bin/bump_app.sh
@@ -13,5 +13,3 @@ NEW_VERSION=$(./bin/bump.sh $CURRENT_VERSION $1)
 echo "Bumping app version in $1 mode from $CURRENT_VERSION to $NEW_VERSION"
 yq w -i helm_chart/Chart.yaml appVersion $NEW_VERSION
 yq w -i helm_chart/values.yaml image.tag $NEW_VERSION
-# Chart version should always be bumped when the app version is bumped.
-./bin/bump_chart.sh $1
diff --git a/bin/bump_app_and_chart.sh b/bin/bump_app_and_chart.sh
new file mode 100755
index 0000000..ecd0662
--- /dev/null
+++ b/bin/bump_app_and_chart.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+# brew install yq
+
+if [ -z "$1" ] ; then
+  echo "Bump mode required: major|minor|patch"
+  exit 1
+fi
+
+CURRENT_VERSION=$(yq r helm_chart/Chart.yaml appVersion)
+NEW_VERSION=$(./bin/bump.sh $CURRENT_VERSION $1)
+
+echo "Bumping app version in $1 mode from $CURRENT_VERSION to $NEW_VERSION"
+yq w -i helm_chart/Chart.yaml appVersion $NEW_VERSION
+yq w -i helm_chart/values.yaml image.tag $NEW_VERSION
+
+echo "Bumping chart version in $1 mode from $CURRENT_VERSION to $NEW_VERSION"
+yq w -i helm_chart/Chart.yaml version $NEW_VERSION
diff --git a/bin/release.sh b/bin/release.sh
index 4e30685..3ab696e 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -19,8 +19,7 @@ fi
 
 BUMP_MODE="$1"
 
-./bin/bump_chart.sh $BUMP_MODE
-./bin/bump_app.sh $BUMP_MODE
+./bin/bump_app_and_chart.sh $BUMP_MODE
 BUMPED_CHART_VERSION=$(yq r helm_chart/Chart.yaml version)
 BUMPED_APP_VERSION=$(yq r helm_chart/Chart.yaml appVersion)
 
diff --git a/helm_chart/Chart.yaml b/helm_chart/Chart.yaml
index b81f7f2..3f5db8f 100644
--- a/helm_chart/Chart.yaml
+++ b/helm_chart/Chart.yaml
@@ -12,10 +12,10 @@ description: Get Helm notifications in your team chat
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.11.7
+version: 0.11.8
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.11.6
+appVersion: 0.11.8
 sources:
   - https://github.com/RoadieHQ/kubewise
 maintainers:
diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml
index b678031..3eb73f1 100644
--- a/helm_chart/values.yaml
+++ b/helm_chart/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 image:
   repository: us.gcr.io/larder-prod/kubewise
-  tag: 0.11.6
+  tag: 0.11.8
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""