From 732f3c1565df79b2ab5a659cb5d4c06be3005bcd Mon Sep 17 00:00:00 2001 From: Deshi Xiao Date: Fri, 30 Mar 2018 00:36:11 +0800 Subject: [PATCH] fix grafana CrashLoopBackoff on image 5.0.3 (#646) this is a known issue with grafana in k8s. grafana/grafana:5.0.4 was just released today. update the repo from 5.0.3 to 5.0.4 fixed issues #582 Signed-off-by: Deshi Xiao --- cli/cmd/install.go | 2 +- cli/cmd/testdata/install_default.golden | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/cmd/install.go b/cli/cmd/install.go index 566cea5b6a48f..15ee52f758729 100644 --- a/cli/cmd/install.go +++ b/cli/cmd/install.go @@ -67,7 +67,7 @@ func validateAndBuildConfig() (*installConfig, error) { ControllerImage: fmt.Sprintf("%s/controller:%s", dockerRegistry, conduitVersion), WebImage: fmt.Sprintf("%s/web:%s", dockerRegistry, conduitVersion), PrometheusImage: "prom/prometheus:v2.1.0", - GrafanaImage: "grafana/grafana:5.0.3", + GrafanaImage: "grafana/grafana:5.0.4", // TODO: these dashboards assume we're running in the "conduit" namespace VizDashboard: install.Viz, DeploymentDashboard: install.Deployment, diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index fe151968cc9e9..c9027ca0dd019 100755 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -633,7 +633,7 @@ spec: conduit.io/proxy-deployment: grafana spec: containers: - - image: grafana/grafana:5.0.3 + - image: grafana/grafana:5.0.4 imagePullPolicy: IfNotPresent name: grafana ports: diff --git a/docker-compose.yml b/docker-compose.yml index 3b312bc7c9f2c..a862590c27ee6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,7 +112,7 @@ services: - --storage.tsdb.retention=6h grafana: - image: grafana/grafana:5.0.3 + image: grafana/grafana:5.0.4 ports: - 3000:3000 volumes: