easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2381 from brancz/update-grafana

Browse Source 
Update grafana
This commit is contained in:
Frederic Branczyk
2019-02-05 15:45:33 +01:00
committed by GitHub
parent 47ab14c624 f1ae21f958
commit 20285c8c95
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@@ -42,8 +42,12 @@ local configMapList = k.core.v1.configMapList;
_config+:: { _config+:: {
namespace: 'default', namespace: 'default',
versions+:: {
grafana: '6.0.0-beta1',
},
tlsCipherSuites: [ 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_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 // 'TLS_RSA_WITH_RC4_128_SHA', // insecure: https://access.redhat.com/security/cve/cve-2013-2566

2
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "f12ea289a1a99cf9fe433ec3a086d436baef6466" "version": "6963b7410f28575a90a65c0aee1c79c8ef392fbb"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",

2
manifests/grafana-deployment.yaml
View File

@@ -16,7 +16,7 @@ spec:
app: grafana app: grafana
spec: spec:
containers: containers:
- image: grafana/grafana:5.2.4 - image: grafana/grafana:6.0.0-beta1
name: grafana name: grafana
ports: ports:
- containerPort: 3000 - containerPort: 3000