From ee65031526968cf6c5c8a2b003185aaa76215cbf Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Tue, 5 Feb 2019 14:04:14 +0100 Subject: [PATCH 1/3] kube-prometheus: Update Grafana to latest beta --- jsonnet/kube-prometheus/kube-prometheus.libsonnet | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 932eba85..c30f13f9 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/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 From a50c13dd2b5be6089fac324093c7a418adcab568 Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Tue, 5 Feb 2019 14:07:05 +0100 Subject: [PATCH 2/3] kube-prometheus: Bump jsonnet deps --- jsonnetfile.lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index f194ca86..a3561854 100644 --- 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", From f1ae21f9582cdb7c0bf73e7ebc7915b091d49379 Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Tue, 5 Feb 2019 14:17:51 +0100 Subject: [PATCH 3/3] kube-prometheus: Re-generate --- manifests/grafana-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 60ffc3b4..2caaca6d 100644 --- 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