Merge pull request #2381 from brancz/update-grafana

Update grafana
2019-02-05 15:45:33 +01:00
parent 47ab14c624 f1ae21f958
commit 20285c8c95
3 changed files with 7 additions and 3 deletions
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -42,6 +42,10 @@ 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_ECDSA_WITH_AES_128_GCM_SHA256',  // required by h2: http://golang.org/cl/30721
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
                    "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
                }
            },
-            "version": "f12ea289a1a99cf9fe433ec3a086d436baef6466"
+            "version": "6963b7410f28575a90a65c0aee1c79c8ef392fbb"
        },
        {
            "name": "ksonnet",
--- a/manifests/grafana-deployment.yaml
+++ b/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