From 64035005d429051afa79968b0016462dc67a07ec Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Wed, 29 Apr 2020 20:51:45 -0700
Subject: [PATCH] Update Grafana from v6.7.2 to v7.0.0-beta1

* https://github.com/grafana/grafana/releases/tag/v7.0.0-beta1
---
 CHANGES.md                     | 6 ++++++
 addons/grafana/deployment.yaml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 96ef5453..f90b70dd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,9 +9,15 @@ Notable changes between versions.
   * Renew Kubelet certificates every 72 hours
 * Update Calico from v3.13.1 to [v3.13.3](https://docs.projectcalico.org/v3.13/release-notes/)
 
+#### AWS
+
+* Fix Terraform plan error when `controller_count` exceeds AWS zones (e.g. 5 controllers) ([#714](https://github.com/poseidon/typhoon/pull/714))
+  * Regressed in v1.17.1 ([#605](https://github.com/poseidon/typhoon/pull/605))
+
 #### Addons
 
 * Update Prometheus from v2.17.1 to v2.17.2
+* Update Grafana from v6.7.2 to v7.0.0-beta1
 
 ## v1.18.2
 
diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml
index 57a0a247..1cd246c9 100644
--- a/addons/grafana/deployment.yaml
+++ b/addons/grafana/deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: grafana
-          image: docker.io/grafana/grafana:6.7.2
+          image: docker.io/grafana/grafana:7.0.0-beta1
           env:
             - name: GF_PATHS_CONFIG
               value: "/etc/grafana/custom.ini"