fix grafana CrashLoopBackoff on image 5.0.3

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 linkerd#582 Signed-off-by: Deshi Xiao <[email protected]>
xiaods · Mar 29, 2018 · 5c00911 · 5c00911
1 parent 67fac9d
commit 5c00911
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/Dockerfile-go-deps b/Dockerfile-go-deps
@@ -21,9 +21,11 @@ RUN GOPATH=${TEMP_GOPATH} bin/dep version
 # because it needs all our source files, which are not available here.
 COPY Gopkg.toml Gopkg.lock ./
 RUN \
+  export http_proxy=http://192.168.1.5:1235; export https_proxy=$http_proxy; echo 'HTTP Proxy on'; \
   GOPATH=${TEMP_GOPATH} bin/dep ensure -vendor-only -v && \
   mv vendor/* /go/src/ && \
-  rm -rf ${TEMP_GOPATH}
+  rm -rf ${TEMP_GOPATH} \
+  unset http_proxy; unset https_proxy; echo 'HTTP Proxy off';
 
 # The previous WORKDIR was deleted. Reset it to avoid any potential for
 # strangeness later.

diff --git a/cli/Dockerfile-bin b/cli/Dockerfile-bin
@@ -1,5 +1,5 @@
 ## compile binaries
-FROM gcr.io/runconduit/go-deps:cc2413fa as golang
+FROM gcr.io/runconduit/go-deps:e5ad921e as golang
 ARG CONDUIT_VERSION
 WORKDIR /go/src/github.com/runconduit/conduit
 COPY cli cli

diff --git 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
@@ -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/controller/Dockerfile b/controller/Dockerfile
@@ -1,5 +1,5 @@
 ## compile controller services
-FROM gcr.io/runconduit/go-deps:cc2413fa as golang
+FROM gcr.io/runconduit/go-deps:e5ad921e as golang
 ARG CONDUIT_VERSION
 WORKDIR /go/src/github.com/runconduit/conduit
 COPY controller/gen controller/gen

diff --git 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:

diff --git a/proxy-init/Dockerfile b/proxy-init/Dockerfile
@@ -1,5 +1,5 @@
 ## compile proxy-init utility
-FROM gcr.io/runconduit/go-deps:cc2413fa as golang
+FROM gcr.io/runconduit/go-deps:e5ad921e as golang
 WORKDIR /go/src/github.com/runconduit/conduit
 COPY ./proxy-init ./proxy-init
 RUN CGO_ENABLED=0 GOOS=linux go install -v -installsuffix cgo ./proxy-init/

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -12,7 +12,7 @@ RUN $HOME/.yarn/bin/yarn install --pure-lockfile
 RUN $HOME/.yarn/bin/yarn webpack
 
 ## compile go server
-FROM gcr.io/runconduit/go-deps:cc2413fa as golang
+FROM gcr.io/runconduit/go-deps:e5ad921e as golang
 ARG CONDUIT_VERSION
 WORKDIR /go/src/github.com/runconduit/conduit
 COPY web web