Merge pull request #743 from weaveworks/bump-helm-chart-v0.15.1

write changelog and bump helm chart for v0.15.1
flux-iac · Jul 6, 2023 · a534880 · a534880
2 parents 5ad2fcd + e2bca4e
commit a534880
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes of this project are documented in this file.
 
+# v0.15.1
+
+**Release date:** 2023-06-06
+
+This version is a bug fix release for v0.15.
+
+Bug Fixing:
+  * Fix type information suffix (@chanwit)
+  * Update gRPC dependency for CVE-2023-32731 (@chanwit)
+
 # v0.15.0
 
 **Release date:** 2023-06-04

diff --git a/charts/tf-controller/Chart.yaml b/charts/tf-controller/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: tf-controller
 description: The Helm chart for Weave GitOps Terraform Controller
 type: application
-version: 0.15.0
-appVersion: "v0.15.0"
+version: 0.15.1
+appVersion: "v0.15.1"
diff --git a/charts/tf-controller/README.md b/charts/tf-controller/README.md
@@ -1,6 +1,6 @@
 # Weave GitOps Terraform Controller
 
-![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.0](https://img.shields.io/badge/AppVersion-v0.15.0-informational?style=flat-square)
+![Version: 0.15.1](https://img.shields.io/badge/Version-0.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.1](https://img.shields.io/badge/AppVersion-v0.15.1-informational?style=flat-square)
 
 The Helm chart for Weave GitOps Terraform Controller
 
@@ -72,7 +72,7 @@ __Note__: If you need to use the `imagePullSecrets` it would be best to set `ser
 | rbac.create | bool | `true` | If `true`, create and use RBAC resources |
 | replicaCount | int | `1` | Number of TF-Controller pods to deploy |
 | resources | object | `{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"64Mi"}}` | Resource limits and requests |
-| runner | object | `{"creationTimeout":"5m0s","grpc":{"maxMessageSize":4},"image":{"repository":"ghcr.io/weaveworks/tf-runner","tag":"v0.15.0"},"serviceAccount":{"allowedNamespaces":[],"annotations":{},"create":true,"name":""}}` | Runner-specific configurations |
+| runner | object | `{"creationTimeout":"5m0s","grpc":{"maxMessageSize":4},"image":{"repository":"ghcr.io/weaveworks/tf-runner","tag":"v0.15.1"},"serviceAccount":{"allowedNamespaces":[],"annotations":{},"create":true,"name":""}}` | Runner-specific configurations |
 | runner.creationTimeout | string | `"5m0s"` | Timeout for runner-creation (Controller) |
 | runner.grpc.maxMessageSize | int | `4` | Maximum GRPC message size (Controller) |
 | runner.image.repository | string | `"ghcr.io/weaveworks/tf-runner"` | Runner image repository |

diff --git a/charts/tf-controller/values.yaml b/charts/tf-controller/values.yaml
@@ -27,7 +27,7 @@ image:
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
   # @default -- `.Chart.AppVersion`
-  tag: "v0.15.0"
+  tag: "v0.15.1"
 # -- Controller image pull secret
 imagePullSecrets: []
 # -- Resource limits and requests
@@ -114,7 +114,7 @@ runner:
     repository: ghcr.io/weaveworks/tf-runner
     # -- Runner image tag
     # @default -- `.Chart.AppVersion`
-    tag: "v0.15.0"
+    tag: "v0.15.1"
   grpc:
     # -- Maximum GRPC message size (Controller)
     maxMessageSize: 4

diff --git a/config/bbp/kustomization.yaml b/config/bbp/kustomization.yaml
@@ -8,4 +8,4 @@ generatorOptions:
 images:
   - name: weaveworks/branch-based-planner
     newName: ghcr.io/weaveworks/branch-based-planner
-    newTag: v0.15.0
+    newTag: v0.15.1
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -8,4 +8,4 @@ generatorOptions:
 images:
   - name: weaveworks/tf-controller
     newName: ghcr.io/weaveworks/tf-controller
-    newTag: v0.15.0
+    newTag: v0.15.1
diff --git a/docs/release.yaml b/docs/release.yaml
@@ -21,7 +21,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: tf-controller
-      version: '>=0.15.0'
+      version: '>=0.15.1'
   interval: 1h0s
   releaseName: tf-controller
   targetNamespace: flux-system
@@ -46,9 +46,9 @@ spec:
     caCertValidityDuration: 24h
     certRotationCheckFrequency: 30m
     image:
-      tag: v0.15.0
+      tag: v0.15.1
     runner:
       image:
-        tag: v0.15.0
+        tag: v0.15.1
       grpc:
         maxMessageSize: 30
diff --git a/tools/bump-version.sh b/tools/bump-version.sh
@@ -2,8 +2,15 @@
 
 VERSION=$1
 
+yq e -i ".version=\"${VERSION#v}\"" charts/tf-controller/Chart.yaml
 yq e -i ".appVersion=\"$VERSION\"" charts/tf-controller/Chart.yaml
 yq e -i ".image.tag=\"$VERSION\"" charts/tf-controller/values.yaml
 yq e -i ".runner.image.tag=\"$VERSION\"" charts/tf-controller/values.yaml
 yq e -i ".images[0].newTag=\"$VERSION\"" config/manager/kustomization.yaml
 yq e -i ".images[0].newTag=\"$VERSION\"" config/bbp/kustomization.yaml
+
+# bump version in docs/release.yaml
+
+yq e -i "(select(di == 1).spec.chart.spec.version) = \">=${VERSION#v}\"" docs/release.yaml
+yq e -i "(select(di == 1).spec.values.image.tag) = \"$VERSION\"" docs/release.yaml
+yq e -i "(select(di == 1).spec.values.runner.image.tag) = \"$VERSION\"" docs/release.yaml