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
This commit is contained in:
albertdb
2019-10-21 12:42:19 +02:00
committed by Frederic Branczyk
parent 3d5fc3e38d
commit 24aebaf985
6 changed files with 5 additions and 6 deletions

View File

@@ -46,7 +46,7 @@ local configMapList = k3.core.v1.configMapList;
namespace: 'default', namespace: 'default',
versions+:: { versions+:: {
grafana: '6.2.2', grafana: '6.4.3',
}, },
tlsCipherSuites: [ tlsCipherSuites: [

View File

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
namespace: 'default', namespace: 'default',
versions+:: { versions+:: {
prometheusAdapter: 'v0.4.1', prometheusAdapter: 'v0.5.0',
}, },
imageRepos+:: { imageRepos+:: {

View File

@@ -57,7 +57,7 @@
"subdir": "grafana" "subdir": "grafana"
} }
}, },
"version": "567be6b15b7f3b747c48dc7b111c1860cab121c7" "version": "539a90dbf63c812ad0194d8078dd776868a11c81"
}, },
{ {
"name": "prometheus-operator", "name": "prometheus-operator",

View File

@@ -22,7 +22,6 @@ resources:
- ./manifests/grafana-dashboardDefinitions.yaml - ./manifests/grafana-dashboardDefinitions.yaml
- ./manifests/grafana-dashboardSources.yaml - ./manifests/grafana-dashboardSources.yaml
- ./manifests/grafana-deployment.yaml - ./manifests/grafana-deployment.yaml
- ./manifests/grafana-rawDashboardDefinitions.yaml
- ./manifests/grafana-service.yaml - ./manifests/grafana-service.yaml
- ./manifests/grafana-serviceAccount.yaml - ./manifests/grafana-serviceAccount.yaml
- ./manifests/grafana-serviceMonitor.yaml - ./manifests/grafana-serviceMonitor.yaml

View File

@@ -16,7 +16,7 @@ spec:
app: grafana app: grafana
spec: spec:
containers: containers:
- image: grafana/grafana:6.2.2 - image: grafana/grafana:6.4.3
name: grafana name: grafana
ports: ports:
- containerPort: 3000 - containerPort: 3000

View File

@@ -25,7 +25,7 @@ spec:
- --metrics-relist-interval=1m - --metrics-relist-interval=1m
- --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/ - --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/
- --secure-port=6443 - --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 name: prometheus-adapter
ports: ports:
- containerPort: 6443 - containerPort: 6443