From eea76c5272d5fad3a370dd37d6204b1d0bb49a5e Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Wed, 4 Nov 2020 17:08:53 +0100
Subject: [PATCH] Update prometheus-operator to v0.43.1
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
.../prometheus/prometheus.libsonnet | 16 ++++++++--------
jsonnetfile.lock.json | 6 +++---
.../prometheus-operator-serviceMonitor.yaml | 4 ++--
manifests/prometheus-prometheus.yaml | 4 ++--
.../setup/prometheus-operator-clusterRole.yaml | 2 +-
.../prometheus-operator-clusterRoleBinding.yaml | 2 +-
.../setup/prometheus-operator-deployment.yaml | 8 ++++----
manifests/setup/prometheus-operator-service.yaml | 2 +-
.../prometheus-operator-serviceAccount.yaml | 2 +-
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index fa2bca05..499cc7df 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -6,7 +6,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
namespace: 'default',
versions+:: {
- prometheus: 'v2.20.0',
+ prometheus: 'v2.22.0',
},
imageRepos+:: {
@@ -256,11 +256,11 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
{
port: 'https-metrics',
interval: '30s',
- scheme: "https",
- bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
+ scheme: 'https',
+ bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
tlsConfig: {
- insecureSkipVerify: true
- }
+ insecureSkipVerify: true,
+ },
},
],
selector: {
@@ -380,10 +380,10 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
{
port: 'https-metrics',
interval: '30s',
- scheme: "https",
- bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
+ scheme: 'https',
+ bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
tlsConfig: {
- insecureSkipVerify: true
+ insecureSkipVerify: true,
},
metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [
{
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 9899a568..56e1f0d8 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -99,7 +99,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "f6ce472ecd6064fb6769e306b55b149dfb6af903",
+ "version": "b4ecadf26f10acb14fcd87c5d288e94e2eaced14",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U="
},
{
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "633ea519b2ce86396f6e006f7fd967c04bc45bda",
- "sum": "P8EcWO33RCyVTfwMdpy4S4jFZjJVHiu190j8yd/CGfs="
+ "version": "5871079854c0c9db963f953a4c690e09a4b4bb0a",
+ "sum": "tmnX7IS6b139Pb6WxODP5w7x5LdqefYM1S7KHWQkpEY="
},
{
"source": {
diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml
index b8422326..974ebef0 100644
--- a/manifests/prometheus-operator-serviceMonitor.yaml
+++ b/manifests/prometheus-operator-serviceMonitor.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -19,4 +19,4 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 4b99429e..c232df5e 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -11,7 +11,7 @@ spec:
- name: alertmanager-main
namespace: monitoring
port: web
- image: quay.io/prometheus/prometheus:v2.20.0
+ image: quay.io/prometheus/prometheus:v2.22.0
nodeSelector:
kubernetes.io/os: linux
podMonitorNamespaceSelector: {}
@@ -33,4 +33,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: v2.20.0
+ version: v2.22.0
diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml
index fc3a62f3..03d58b3c 100644
--- a/manifests/setup/prometheus-operator-clusterRole.yaml
+++ b/manifests/setup/prometheus-operator-clusterRole.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
index 2cd3d33c..befd4042 100644
--- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
+++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml
index d2266cb3..91bdbfa7 100644
--- a/manifests/setup/prometheus-operator-deployment.yaml
+++ b/manifests/setup/prometheus-operator-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -18,14 +18,14 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.43.0
- image: quay.io/prometheus-operator/prometheus-operator:v0.43.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.43.1
+ image: quay.io/prometheus-operator/prometheus-operator:v0.43.1
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml
index b76a542c..794d6b35 100644
--- a/manifests/setup/prometheus-operator-service.yaml
+++ b/manifests/setup/prometheus-operator-service.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml
index ad635b9e..c251d578 100644
--- a/manifests/setup/prometheus-operator-serviceAccount.yaml
+++ b/manifests/setup/prometheus-operator-serviceAccount.yaml
@@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.43.0
+ app.kubernetes.io/version: v0.43.1
name: prometheus-operator
namespace: monitoring
--
GitLab