From 24aebaf98578d03b7ef85b2eb404260b3ce15f1a Mon Sep 17 00:00:00 2001
From: albertdb <albertdb@users.noreply.github.com>
Date: Mon, 21 Oct 2019 12:42:19 +0200
Subject: [PATCH] Bump prometheus-adapter and Grafana versions (#270)
* Bumping prometheus-adapter and Grafana versions
* Bumping prometheus-adapter version in libsonnet file
* Regenerating lockfile
* Bumping Grafana version in libsonnet file
* Updating kustomization.yaml
---
jsonnet/kube-prometheus/kube-prometheus.libsonnet | 2 +-
.../prometheus-adapter/prometheus-adapter.libsonnet | 2 +-
jsonnetfile.lock.json | 2 +-
kustomization.yaml | 1 -
manifests/grafana-deployment.yaml | 2 +-
manifests/prometheus-adapter-deployment.yaml | 2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 497dbbbf..a33ccc1a 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -46,7 +46,7 @@ local configMapList = k3.core.v1.configMapList;
namespace: 'default',
versions+:: {
- grafana: '6.2.2',
+ grafana: '6.4.3',
},
tlsCipherSuites: [
diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
index f950ed69..42cf59e7 100644
--- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
namespace: 'default',
versions+:: {
- prometheusAdapter: 'v0.4.1',
+ prometheusAdapter: 'v0.5.0',
},
imageRepos+:: {
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index d5433547..5d054e2b 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -57,7 +57,7 @@
"subdir": "grafana"
}
},
- "version": "567be6b15b7f3b747c48dc7b111c1860cab121c7"
+ "version": "539a90dbf63c812ad0194d8078dd776868a11c81"
},
{
"name": "prometheus-operator",
diff --git a/kustomization.yaml b/kustomization.yaml
index 95f9dc3d..a580ed8e 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -22,7 +22,6 @@ resources:
- ./manifests/grafana-dashboardDefinitions.yaml
- ./manifests/grafana-dashboardSources.yaml
- ./manifests/grafana-deployment.yaml
-- ./manifests/grafana-rawDashboardDefinitions.yaml
- ./manifests/grafana-service.yaml
- ./manifests/grafana-serviceAccount.yaml
- ./manifests/grafana-serviceMonitor.yaml
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 4485b165..e4bd4d73 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -16,7 +16,7 @@ spec:
app: grafana
spec:
containers:
- - image: grafana/grafana:6.2.2
+ - image: grafana/grafana:6.4.3
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml
index d2286d93..2228106a 100644
--- a/manifests/prometheus-adapter-deployment.yaml
+++ b/manifests/prometheus-adapter-deployment.yaml
@@ -25,7 +25,7 @@ spec:
- --metrics-relist-interval=1m
- --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/
- --secure-port=6443
- image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.4.1
+ image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.5.0
name: prometheus-adapter
ports:
- containerPort: 6443
--
GitLab