From 874eaa280e0931020c7c1c9f0e489bf48dd381f5 Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Mon, 5 Sep 2022 10:58:12 +0200
Subject: [PATCH] [bot] [main] Automated version update (#1862)
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
---
jsonnet/kube-prometheus/versions.json | 4 +-
jsonnetfile.lock.json | 20 +--
manifests/grafana-config.yaml | 2 +-
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 50 ++++----
manifests/grafana-dashboardSources.yaml | 2 +-
manifests/grafana-deployment.yaml | 12 +-
manifests/grafana-networkPolicy.yaml | 2 +-
manifests/grafana-prometheusRule.yaml | 2 +-
manifests/grafana-service.yaml | 2 +-
manifests/grafana-serviceAccount.yaml | 2 +-
manifests/grafana-serviceMonitor.yaml | 2 +-
manifests/prometheusOperator-clusterRole.yaml | 2 +-
...prometheusOperator-clusterRoleBinding.yaml | 2 +-
manifests/prometheusOperator-deployment.yaml | 8 +-
.../prometheusOperator-networkPolicy.yaml | 2 +-
.../prometheusOperator-prometheusRule.yaml | 2 +-
manifests/prometheusOperator-service.yaml | 2 +-
.../prometheusOperator-serviceAccount.yaml | 2 +-
.../prometheusOperator-serviceMonitor.yaml | 4 +-
...0alertmanagerCustomResourceDefinition.yaml | 121 +++++++++++++++---
.../0prometheusCustomResourceDefinition.yaml | 76 ++++++++---
.../0thanosrulerCustomResourceDefinition.yaml | 76 ++++++++---
23 files changed, 273 insertions(+), 126 deletions(-)
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index cc4fd6d1..0f16aac8 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,12 +1,12 @@
{
"alertmanager": "0.24.0",
"blackboxExporter": "0.22.0",
- "grafana": "9.1.1",
+ "grafana": "9.1.2",
"kubeStateMetrics": "2.6.0",
"nodeExporter": "1.3.1",
"prometheus": "2.38.0",
"prometheusAdapter": "0.9.1",
- "prometheusOperator": "0.58.0",
+ "prometheusOperator": "0.59.0",
"kubeRbacProxy": "0.13.0",
"configmapReload": "0.5.0",
"pyrra": "0.4.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 79cd1866..e577a160 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "f56e0d0e15d51a896601a9b9cebbac8c58435420",
+ "version": "4d57eb8d3b2190bfdba3c65f8eb93c0349fc6dcc",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "acca9b050edddbe2273e4c64a008487efb765859",
+ "version": "20ef8a759681c8ed263184f481f4b60686f300bd",
"sum": "evJ+PXRzuM1tezCG5WzpAn4Lk3YJfMvDFcs+45fsscU="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "acca9b050edddbe2273e4c64a008487efb765859",
+ "version": "20ef8a759681c8ed263184f481f4b60686f300bd",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "01c771cefb34e79667515294c7671ff98292278d",
+ "version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "01c771cefb34e79667515294c7671ff98292278d",
- "sum": "hV3FK2ekNFLUlKnj5chRp8WKKxZemfbwynYWK5RkY1E="
+ "version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f",
+ "sum": "yyCtOZvvEmJ7jL8oogGCt89X/acej9flL588+P4g9F4="
},
{
"source": {
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "46748fd229e249c0d7a9198a98e6f9450d437478",
+ "version": "4ad86b349b7ffdbc30087c00a12def3254fd850b",
"sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "314aa45c2ced676d6a76d5ce9333a60faa331570",
+ "version": "6767f6e1a946af41f83ca233c6fbfc94a928abee",
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "dd82519ae36a7d00486b1862fc23d805ba84e06b",
+ "version": "389fb2d2276d030a78551c472a131146f2cc0d48",
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
},
{
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
- "version": "544d67a8f3f0c8187afa974cad71972aeb10d297",
+ "version": "a947f33e1420d7ad4e171c4300b81a0dac1b083a",
"sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 574cf194..6c2c10da 100644
--- a/manifests/grafana-config.yaml
+++ b/manifests/grafana-config.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index f024fb13..17afdddb 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 283d6278..3c4a8cfd 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -600,7 +600,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2361,7 +2361,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4232,7 +4232,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5411,7 +5411,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6036,7 +6036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9113,7 +9113,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11899,7 +11899,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12914,7 +12914,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15372,7 +15372,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17385,7 +17385,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19563,7 +19563,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21806,7 +21806,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23259,7 +23259,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24984,7 +24984,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26036,7 +26036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27114,7 +27114,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28176,7 +28176,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -29231,7 +29231,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -29807,7 +29807,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31024,7 +31024,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -32683,7 +32683,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -33907,7 +33907,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -35167,7 +35167,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -36268,7 +36268,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -37695,7 +37695,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 0aa41e49..b118e3e9 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -22,6 +22,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index f3ab8ca3..e186ea09 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 0542ba9d9c454a4aaa1f95e2931e87ea
- checksum/grafana-dashboardproviders: 96ab91fd3f7ddd4a9dce4ddc915cb54e
- checksum/grafana-datasources: 05cd3c4f772ba1421a095643281548d0
+ checksum/grafana-config: 3df48d50924aa9626c7423c043e81828
+ checksum/grafana-dashboardproviders: a5559a08054be15861267cb897f5238c
+ checksum/grafana-datasources: 908923847f5d72db94c28414e5b6a139
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:9.1.1
+ image: grafana/grafana:9.1.2
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 6b488ac4..e8f80edf 100644
--- a/manifests/grafana-networkPolicy.yaml
+++ b/manifests/grafana-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 205e9ebc..5bb37968 100644
--- a/manifests/grafana-prometheusRule.yaml
+++ b/manifests/grafana-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 7a67ad58..034ecfdc 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 2332ff4e..32a77248 100644
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 2d9fd776..93659b33 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.1
+ app.kubernetes.io/version: 9.1.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 0402c434..9b0ee6d5 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index 5e23d5d8..80f734ab 100644
--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 828e0c1e..9c734efd 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,14 +23,14 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0
- image: quay.io/prometheus-operator/prometheus-operator:v0.58.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.59.0
+ image: quay.io/prometheus-operator/prometheus-operator:v0.59.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 659f9fd8..c8e9a63b 100644
--- a/manifests/prometheusOperator-networkPolicy.yaml
+++ b/manifests/prometheusOperator-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index 4dabe6bb..de3f6899 100644
--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index a5883f2d..87e2dd2b 100644
--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 35cfe4cc..e4e1589d 100644
--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index dbd7d74e..b036cbe6 100644
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.58.0
+ app.kubernetes.io/version: 0.59.0
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 8769c40c..e4e7ac1d 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -1340,6 +1340,51 @@ spec:
and inhibition rules.
minLength: 1
type: string
+ templates:
+ description: Custom notification templates.
+ items:
+ description: SecretOrConfigMap allows to specify data as a Secret
+ or ConfigMap. Fields are mutually exclusive.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key
+ must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must
+ be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must
+ be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ type: array
type: object
baseImage:
description: 'Base image that is used to deploy pods, without tag.
@@ -1943,13 +1988,13 @@ spec:
Cannot be updated.
type: string
ports:
- description: List of ports to expose from the container. Exposing
- a port here gives the system additional information about
- the network connections a container uses, but is primarily
- informational. Not specifying a port here DOES NOT prevent
- that port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container will be
- accessible from the network. Cannot be updated.
+ description: List of ports to expose from the container. Not
+ specifying a port here DOES NOT prevent that port from being
+ exposed. Any port which is listening on the default "0.0.0.0"
+ address inside a container will be accessible from the network.
+ Modifying this array with strategic merge patch may corrupt
+ the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+ Cannot be updated.
items:
description: ContainerPort represents a network port in a
single container.
@@ -3228,13 +3273,13 @@ spec:
Cannot be updated.
type: string
ports:
- description: List of ports to expose from the container. Exposing
- a port here gives the system additional information about
- the network connections a container uses, but is primarily
- informational. Not specifying a port here DOES NOT prevent
- that port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container will be
- accessible from the network. Cannot be updated.
+ description: List of ports to expose from the container. Not
+ specifying a port here DOES NOT prevent that port from being
+ exposed. Any port which is listening on the default "0.0.0.0"
+ address inside a container will be accessible from the network.
+ Modifying this array with strategic merge patch may corrupt
+ the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+ Cannot be updated.
items:
description: ContainerPort represents a network port in a
single container.
@@ -4857,6 +4902,19 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: MatchLabelKeys is a set of pod label keys to select
+ the pods over which spreading will be calculated. The keys
+ are used to lookup values from the incoming pod labels, those
+ key-value labels are ANDed with labelSelector to select the
+ group of existing pods over which spreading will be calculated
+ for the incoming pod. Keys that don't exist in the incoming
+ pod labels will be ignored. A null or empty list means only
+ match against labelSelector.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
maxSkew:
description: 'MaxSkew describes the degree to which pods may
be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
@@ -4897,11 +4955,31 @@ spec:
minimum\" is treated as 0. In this situation, new pod with
the same labelSelector cannot be scheduled, because computed
skew will be 3(3 - 0) if new Pod is scheduled to any of the
- three zones, it will violate MaxSkew. \n This is an alpha
- field and requires enabling MinDomainsInPodTopologySpread
- feature gate."
+ three zones, it will violate MaxSkew. \n This is a beta field
+ and requires the MinDomainsInPodTopologySpread feature gate
+ to be enabled (enabled by default)."
format: int32
type: integer
+ nodeAffinityPolicy:
+ description: "NodeAffinityPolicy indicates how we will treat
+ Pod's nodeAffinity/nodeSelector when calculating pod topology
+ spread skew. Options are: - Honor: only nodes matching nodeAffinity/nodeSelector
+ are included in the calculations. - Ignore: nodeAffinity/nodeSelector
+ are ignored. All nodes are included in the calculations. \n
+ If this value is nil, the behavior is equivalent to the Honor
+ policy. This is a alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread
+ feature flag."
+ type: string
+ nodeTaintsPolicy:
+ description: "NodeTaintsPolicy indicates how we will treat node
+ taints when calculating pod topology spread skew. Options
+ are: - Honor: nodes without taints, along with tainted nodes
+ for which the incoming pod has a toleration, are included.
+ - Ignore: node taints are ignored. All nodes are included.
+ \n If this value is nil, the behavior is equivalent to the
+ Ignore policy. This is a alpha-level feature enabled by the
+ NodeInclusionPolicyInPodTopologySpread feature flag."
+ type: string
topologyKey:
description: TopologyKey is the key of node labels. Nodes that
have a label with this key and identical values are considered
@@ -4909,10 +4987,11 @@ spec:
as a "bucket", and try to put balanced number of pods into
each bucket. We define a domain as a particular instance of
a topology. Also, we define an eligible domain as a domain
- whose nodes match the node selector. e.g. If TopologyKey is
- "kubernetes.io/hostname", each Node is a domain of that topology.
- And, if TopologyKey is "topology.kubernetes.io/zone", each
- zone is a domain of that topology. It's a required field.
+ whose nodes meet the requirements of nodeAffinityPolicy and
+ nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname",
+ each Node is a domain of that topology. And, if TopologyKey
+ is "topology.kubernetes.io/zone", each zone is a domain of
+ that topology. It's a required field.
type: string
whenUnsatisfiable:
description: 'WhenUnsatisfiable indicates how to deal with a
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 8cce0482..9290f2f7 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -2026,13 +2026,13 @@ spec:
Cannot be updated.
type: string
ports:
- description: List of ports to expose from the container. Exposing
- a port here gives the system additional information about
- the network connections a container uses, but is primarily
- informational. Not specifying a port here DOES NOT prevent
- that port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container will be
- accessible from the network. Cannot be updated.
+ description: List of ports to expose from the container. Not
+ specifying a port here DOES NOT prevent that port from being
+ exposed. Any port which is listening on the default "0.0.0.0"
+ address inside a container will be accessible from the network.
+ Modifying this array with strategic merge patch may corrupt
+ the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+ Cannot be updated.
items:
description: ContainerPort represents a network port in a
single container.
@@ -3462,13 +3462,13 @@ spec:
Cannot be updated.
type: string
ports:
- description: List of ports to expose from the container. Exposing
- a port here gives the system additional information about
- the network connections a container uses, but is primarily
- informational. Not specifying a port here DOES NOT prevent
- that port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container will be
- accessible from the network. Cannot be updated.
+ description: List of ports to expose from the container. Not
+ specifying a port here DOES NOT prevent that port from being
+ exposed. Any port which is listening on the default "0.0.0.0"
+ address inside a container will be accessible from the network.
+ Modifying this array with strategic merge patch may corrupt
+ the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+ Cannot be updated.
items:
description: ContainerPort represents a network port in a
single container.
@@ -6801,6 +6801,19 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: MatchLabelKeys is a set of pod label keys to select
+ the pods over which spreading will be calculated. The keys
+ are used to lookup values from the incoming pod labels, those
+ key-value labels are ANDed with labelSelector to select the
+ group of existing pods over which spreading will be calculated
+ for the incoming pod. Keys that don't exist in the incoming
+ pod labels will be ignored. A null or empty list means only
+ match against labelSelector.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
maxSkew:
description: 'MaxSkew describes the degree to which pods may
be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
@@ -6841,11 +6854,31 @@ spec:
minimum\" is treated as 0. In this situation, new pod with
the same labelSelector cannot be scheduled, because computed
skew will be 3(3 - 0) if new Pod is scheduled to any of the
- three zones, it will violate MaxSkew. \n This is an alpha
- field and requires enabling MinDomainsInPodTopologySpread
- feature gate."
+ three zones, it will violate MaxSkew. \n This is a beta field
+ and requires the MinDomainsInPodTopologySpread feature gate
+ to be enabled (enabled by default)."
format: int32
type: integer
+ nodeAffinityPolicy:
+ description: "NodeAffinityPolicy indicates how we will treat
+ Pod's nodeAffinity/nodeSelector when calculating pod topology
+ spread skew. Options are: - Honor: only nodes matching nodeAffinity/nodeSelector
+ are included in the calculations. - Ignore: nodeAffinity/nodeSelector
+ are ignored. All nodes are included in the calculations. \n
+ If this value is nil, the behavior is equivalent to the Honor
+ policy. This is a alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread
+ feature flag."
+ type: string
+ nodeTaintsPolicy:
+ description: "NodeTaintsPolicy indicates how we will treat node
+ taints when calculating pod topology spread skew. Options
+ are: - Honor: nodes without taints, along with tainted nodes
+ for which the incoming pod has a toleration, are included.
+ - Ignore: node taints are ignored. All nodes are included.
+ \n If this value is nil, the behavior is equivalent to the
+ Ignore policy. This is a alpha-level feature enabled by the
+ NodeInclusionPolicyInPodTopologySpread feature flag."
+ type: string
topologyKey:
description: TopologyKey is the key of node labels. Nodes that
have a label with this key and identical values are considered
@@ -6853,10 +6886,11 @@ spec:
as a "bucket", and try to put balanced number of pods into
each bucket. We define a domain as a particular instance of
a topology. Also, we define an eligible domain as a domain
- whose nodes match the node selector. e.g. If TopologyKey is
- "kubernetes.io/hostname", each Node is a domain of that topology.
- And, if TopologyKey is "topology.kubernetes.io/zone", each
- zone is a domain of that topology. It's a required field.
+ whose nodes meet the requirements of nodeAffinityPolicy and
+ nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname",
+ each Node is a domain of that topology. And, if TopologyKey
+ is "topology.kubernetes.io/zone", each zone is a domain of
+ that topology. It's a required field.
type: string
whenUnsatisfiable:
description: 'WhenUnsatisfiable indicates how to deal with a
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 394f8fbd..f01c0280 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -1506,13 +1506,13 @@ spec:
Cannot be updated.
type: string
ports:
- description: List of ports to expose from the container. Exposing
- a port here gives the system additional information about
- the network connections a container uses, but is primarily
- informational. Not specifying a port here DOES NOT prevent
- that port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container will be
- accessible from the network. Cannot be updated.
+ description: List of ports to expose from the container. Not
+ specifying a port here DOES NOT prevent that port from being
+ exposed. Any port which is listening on the default "0.0.0.0"
+ address inside a container will be accessible from the network.
+ Modifying this array with strategic merge patch may corrupt
+ the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+ Cannot be updated.
items:
description: ContainerPort represents a network port in a
single container.
@@ -2953,13 +2953,13 @@ spec:
Cannot be updated.
type: string
ports:
- description: List of ports to expose from the container. Exposing
- a port here gives the system additional information about
- the network connections a container uses, but is primarily
- informational. Not specifying a port here DOES NOT prevent
- that port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container will be
- accessible from the network. Cannot be updated.
+ description: List of ports to expose from the container. Not
+ specifying a port here DOES NOT prevent that port from being
+ exposed. Any port which is listening on the default "0.0.0.0"
+ address inside a container will be accessible from the network.
+ Modifying this array with strategic merge patch may corrupt
+ the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+ Cannot be updated.
items:
description: ContainerPort represents a network port in a
single container.
@@ -4729,6 +4729,19 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: MatchLabelKeys is a set of pod label keys to select
+ the pods over which spreading will be calculated. The keys
+ are used to lookup values from the incoming pod labels, those
+ key-value labels are ANDed with labelSelector to select the
+ group of existing pods over which spreading will be calculated
+ for the incoming pod. Keys that don't exist in the incoming
+ pod labels will be ignored. A null or empty list means only
+ match against labelSelector.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
maxSkew:
description: 'MaxSkew describes the degree to which pods may
be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
@@ -4769,11 +4782,31 @@ spec:
minimum\" is treated as 0. In this situation, new pod with
the same labelSelector cannot be scheduled, because computed
skew will be 3(3 - 0) if new Pod is scheduled to any of the
- three zones, it will violate MaxSkew. \n This is an alpha
- field and requires enabling MinDomainsInPodTopologySpread
- feature gate."
+ three zones, it will violate MaxSkew. \n This is a beta field
+ and requires the MinDomainsInPodTopologySpread feature gate
+ to be enabled (enabled by default)."
format: int32
type: integer
+ nodeAffinityPolicy:
+ description: "NodeAffinityPolicy indicates how we will treat
+ Pod's nodeAffinity/nodeSelector when calculating pod topology
+ spread skew. Options are: - Honor: only nodes matching nodeAffinity/nodeSelector
+ are included in the calculations. - Ignore: nodeAffinity/nodeSelector
+ are ignored. All nodes are included in the calculations. \n
+ If this value is nil, the behavior is equivalent to the Honor
+ policy. This is a alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread
+ feature flag."
+ type: string
+ nodeTaintsPolicy:
+ description: "NodeTaintsPolicy indicates how we will treat node
+ taints when calculating pod topology spread skew. Options
+ are: - Honor: nodes without taints, along with tainted nodes
+ for which the incoming pod has a toleration, are included.
+ - Ignore: node taints are ignored. All nodes are included.
+ \n If this value is nil, the behavior is equivalent to the
+ Ignore policy. This is a alpha-level feature enabled by the
+ NodeInclusionPolicyInPodTopologySpread feature flag."
+ type: string
topologyKey:
description: TopologyKey is the key of node labels. Nodes that
have a label with this key and identical values are considered
@@ -4781,10 +4814,11 @@ spec:
as a "bucket", and try to put balanced number of pods into
each bucket. We define a domain as a particular instance of
a topology. Also, we define an eligible domain as a domain
- whose nodes match the node selector. e.g. If TopologyKey is
- "kubernetes.io/hostname", each Node is a domain of that topology.
- And, if TopologyKey is "topology.kubernetes.io/zone", each
- zone is a domain of that topology. It's a required field.
+ whose nodes meet the requirements of nodeAffinityPolicy and
+ nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname",
+ each Node is a domain of that topology. And, if TopologyKey
+ is "topology.kubernetes.io/zone", each zone is a domain of
+ that topology. It's a required field.
type: string
whenUnsatisfiable:
description: 'WhenUnsatisfiable indicates how to deal with a
--
GitLab