mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-31 08:01:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #685 from lilic/bump-prom-operator

Browse Source 
Bump to prometheus-operator 0.42.1 and update all deps
This commit is contained in:
Frederic Branczyk 2020-09-23 10:34:17 +02:00 committed by GitHub
commit f2a014c751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
jsonnetfile.lock.json
View File

@ -4,27 +4,27 @@
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/brancz/kubernetes-grafana", "remote": "https://github.com/brancz/kubernetes-grafana.git",
"subdir": "grafana" "subdir": "grafana"
} }
}, },
"version": "18c50c83ea49291b0aa00067e4b2b386556ba0e3", "version": "d7c1a53462ecd533593c60e5277b92fbf7ea7623",
"sum": "GEVLrcKGvUuvjq6bDhaWr4fOwkG5QMDpnUhHxUUywwg=" "sum": "8OnIwMhzWtgoWYHNrDlkzUAMr/CPsWKauYEv0vnH1zs="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/etcd-io/etcd", "remote": "https://github.com/etcd-io/etcd.git",
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "76e769ce95ca0d4d0e3486712d96956260db04b8", "version": "205a656cc58b32ab701c74297ce440bd517a680f",
"sum": "NhOkJWkO7ZO2DSE8Fvipcs7Hh2/GOCS0WjPPZU8OiaQ=" "sum": "NhOkJWkO7ZO2DSE8Fvipcs7Hh2/GOCS0WjPPZU8OiaQ="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/grafana/grafonnet-lib", "remote": "https://github.com/grafana/grafonnet-lib.git",
"subdir": "grafonnet" "subdir": "grafonnet"
} }
}, },
@ -34,17 +34,17 @@
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/grafana/jsonnet-libs", "remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "797035a3d20100a6e8f7c973cee70e465f37b880", "version": "ecc83f569bbf56f2863e9c3cefa4487e3253aaa6",
"sum": "R5WJe6wW0R9vMpOAHaGFwcK8q4NmGZ0aLhdZGKDHeMU=" "sum": "mD0zEP9FVFXeag7EaeS5OvUr2A9D6DQhGemoNn6+PLc="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/ksonnet/ksonnet-lib", "remote": "https://github.com/ksonnet/ksonnet-lib.git",
"subdir": "" "subdir": ""
} }
}, },
@ -55,77 +55,77 @@
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin", "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
"subdir": "" "subdir": ""
} }
}, },
"version": "64aa37e837b0e93bfc6fab9430f57bd7366e5a83", "version": "5c07e1de2c8ea4f8fdcc1985712daa5e751a327f",
"sum": "1GDIeGMtvcen1PVF/XXLWv3JbCdV2ZbHcvecU9xZCFo=" "sum": "k4V7WfQtyb2JXDczC6fBXjqph2RmLZfKpWTv3mmuj2s="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin", "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
"subdir": "lib/promgrafonnet" "subdir": "lib/promgrafonnet"
} }
}, },
"version": "64aa37e837b0e93bfc6fab9430f57bd7366e5a83", "version": "5c07e1de2c8ea4f8fdcc1985712daa5e751a327f",
"sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc=" "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/kubernetes/kube-state-metrics", "remote": "https://github.com/kubernetes/kube-state-metrics.git",
"subdir": "jsonnet/kube-state-metrics" "subdir": "jsonnet/kube-state-metrics"
} }
}, },
"version": "5fd7281987d57c02e65ca5479c90099814e68ee5", "version": "2ebe4dffc52ee2d1ca5b6444be54bcf0dba5372a",
"sum": "cJjGZaLBjcIGrLHZLjRPU9c3KL+ep9rZTb9dbALSKqA=" "sum": "WJGwddC7KJnEN7CWGELiOHKam+vmv9XYkwrMCwmXi2M="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/kubernetes/kube-state-metrics", "remote": "https://github.com/kubernetes/kube-state-metrics.git",
"subdir": "jsonnet/kube-state-metrics-mixin" "subdir": "jsonnet/kube-state-metrics-mixin"
} }
}, },
"version": "5fd7281987d57c02e65ca5479c90099814e68ee5", "version": "2ebe4dffc52ee2d1ca5b6444be54bcf0dba5372a",
"sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo=" "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/prometheus-operator/prometheus-operator", "remote": "https://github.com/prometheus-operator/prometheus-operator.git",
"subdir": "jsonnet/mixin" "subdir": "jsonnet/mixin"
} }
}, },
"version": "64863c320adddf1ab7da9cd0af1bea6978f9a72b", "version": "d7befd55020b3c040bea42fdb5b13d9f9d96474c",
"sum": "vqz67twCROf5kVgo/61luBOx25Mk7Okbt8YP+/7xjT0=" "sum": "vqz67twCROf5kVgo/61luBOx25Mk7Okbt8YP+/7xjT0="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/prometheus-operator/prometheus-operator", "remote": "https://github.com/prometheus-operator/prometheus-operator.git",
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "96094ad1ab039950537df448b95bbcc04c57bfc4", "version": "a1eb8fd04f3cd2bfb11aee8943e0b3469ff2f199",
"sum": "ReamRYoS2C39Of7KtXGqkSWdfHw5Fy/Ix6ujOmBLFAg=" "sum": "nM1eDP5vftqAeQSmVYzSBAh+lG0SN6zu46QiocQiVhk="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/prometheus/node_exporter", "remote": "https://github.com/prometheus/node_exporter.git",
"subdir": "docs/node-mixin" "subdir": "docs/node-mixin"
} }
}, },
"version": "d8a1585f59ef1169837d08979ecc92dcea8aa58a", "version": "ff2ff3410f4ea8195e51f5fb8d84151684f91b3f",
"sum": "EE+C+Krf518EGLjA/x3ZvKfenCI0J7YuwFJVBscypRw=" "sum": "znDrZiHvvascm7Xuj3lTASIOfwX4Vmx7PELmKKw4YiI="
}, },
{ {
"source": { "source": {
"git": { "git": {
"remote": "https://github.com/prometheus/prometheus", "remote": "https://github.com/prometheus/prometheus.git",
"subdir": "documentation/prometheus-mixin" "subdir": "documentation/prometheus-mixin"
} }
}, },

4
manifests/grafana-dashboardDefinitions.yaml
View File

@ -16597,7 +16597,7 @@ items:
"tableColumn": "", "tableColumn": "",
"targets": [ "targets": [
{ {
"expr": "sum(kubelet_running_pod_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", "expr": "sum(kubelet_running_pods{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})",
"format": "time_series", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "{{instance}}", "legendFormat": "{{instance}}",
@ -16681,7 +16681,7 @@ items:
"tableColumn": "", "tableColumn": "",
"targets": [ "targets": [
{ {
"expr": "sum(kubelet_running_container_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", "expr": "sum(kubelet_running_containers{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})",
"format": "time_series", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "{{instance}}", "legendFormat": "{{instance}}",

4
manifests/prometheus-operator-serviceMonitor.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
@ -19,4 +19,4 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1

2
manifests/setup/prometheus-operator-clusterRole.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
name: prometheus-operator name: prometheus-operator
rules: rules:
- apiGroups: - apiGroups:

2
manifests/setup/prometheus-operator-clusterRoleBinding.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
name: prometheus-operator name: prometheus-operator
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io

8
manifests/setup/prometheus-operator-deployment.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
@ -18,15 +18,15 @@ spec:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
spec: spec:
containers: containers:
- args: - args:
- --kubelet-service=kube-system/kubelet - --kubelet-service=kube-system/kubelet
- --logtostderr=true - --logtostderr=true
- --config-reloader-image=jimmidyson/configmap-reload:v0.4.0 - --config-reloader-image=jimmidyson/configmap-reload:v0.4.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.42.0 - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.42.1
image: quay.io/prometheus-operator/prometheus-operator:v0.42.0 image: quay.io/prometheus-operator/prometheus-operator:v0.42.1
name: prometheus-operator name: prometheus-operator
ports: ports:
- containerPort: 8080 - containerPort: 8080

2
manifests/setup/prometheus-operator-service.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:

2
manifests/setup/prometheus-operator-serviceAccount.yaml
View File

@ -4,6 +4,6 @@ metadata:
labels: labels:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.42.0 app.kubernetes.io/version: v0.42.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring