Merge pull request prometheus-operator#2381 from brancz/update-grafana

Update grafana
therealmitchconnors · Feb 5, 2019 · f7bee3a · f7bee3a
2 parents 75ff20f + e5fed2b
commit f7bee3a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/contrib/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/contrib/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -42,8 +42,12 @@ local configMapList = k.core.v1.configMapList;
   _config+:: {
     namespace: 'default',
 
+    versions+:: {
+      grafana: '6.0.0-beta1',
+    },
+
     tlsCipherSuites: [
-      'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',    // required by h2: http://golang.org/cl/30721
+      'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',  // required by h2: http://golang.org/cl/30721
       'TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256',  // required by h2: http://golang.org/cl/30721
 
       // 'TLS_RSA_WITH_RC4_128_SHA',            // insecure: https://access.redhat.com/security/cve/cve-2013-2566

diff --git a/contrib/kube-prometheus/jsonnetfile.lock.json b/contrib/kube-prometheus/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
                     "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
                 }
             },
-            "version": "f12ea289a1a99cf9fe433ec3a086d436baef6466"
+            "version": "6963b7410f28575a90a65c0aee1c79c8ef392fbb"
         },
         {
             "name": "ksonnet",

diff --git a/contrib/kube-prometheus/manifests/grafana-deployment.yaml b/contrib/kube-prometheus/manifests/grafana-deployment.yaml
@@ -16,7 +16,7 @@ spec:
         app: grafana
     spec:
       containers:
-      - image: grafana/grafana:5.2.4
+      - image: grafana/grafana:6.0.0-beta1
         name: grafana
         ports:
         - containerPort: 3000