From 77065de723026e7ca7f3dc5c603f8206ee840347 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:35:19 +0100 Subject: [PATCH] [bot] [main] Automated version update (#2590) Co-authored-by: Prometheus Operator Bot --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 24 +++++++++---------- manifests/alertmanager-alertmanager.yaml | 8 +++---- manifests/alertmanager-networkPolicy.yaml | 2 +- .../alertmanager-podDisruptionBudget.yaml | 2 +- manifests/alertmanager-prometheusRule.yaml | 2 +- manifests/alertmanager-secret.yaml | 2 +- manifests/alertmanager-service.yaml | 2 +- manifests/alertmanager-serviceAccount.yaml | 2 +- manifests/alertmanager-serviceMonitor.yaml | 2 +- ...managerConfigCustomResourceDefinition.yaml | 2 +- ...0alertmanagerCustomResourceDefinition.yaml | 2 +- .../0podmonitorCustomResourceDefinition.yaml | 2 +- .../setup/0probeCustomResourceDefinition.yaml | 2 +- .../0prometheusCustomResourceDefinition.yaml | 12 +++++++++- ...ometheusagentCustomResourceDefinition.yaml | 12 +++++++++- ...rometheusruleCustomResourceDefinition.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 2 +- ...ervicemonitorCustomResourceDefinition.yaml | 2 +- .../0thanosrulerCustomResourceDefinition.yaml | 2 +- 20 files changed, 54 insertions(+), 34 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index b6f359cd15..bbf26aeca5 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,5 +1,5 @@ { - "alertmanager": "0.27.0", + "alertmanager": "0.28.0", "blackboxExporter": "0.25.0", "grafana": "11.4.0", "kubeStateMetrics": "2.14.0", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 088fd07f2c..5b781c6230 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "5813dce9ad1a9e31d9b51d199d374e68d233e439", + "version": "83cf7bb4fc621f017fcaa9a735194fcec23420b8", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -78,7 +78,7 @@ "subdir": "grafana-builder" } }, - "version": "748f8a97f55b2575692d1990138da84c270704fa", + "version": "81276dc16831be896821b44b03a6405b4af8a8b4", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -88,7 +88,7 @@ "subdir": "mixin-utils" } }, - "version": "748f8a97f55b2575692d1990138da84c270704fa", + "version": "81276dc16831be896821b44b03a6405b4af8a8b4", "sum": "SRElwa/XrKAN8aZA9zvdRUx8iebl2It7KNQ7VFvMcBA=" }, { @@ -128,7 +128,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "c198a18d289d520f462675e622a06a85404b5a0b", + "version": "288b3cf855c33e6e222dcd16a4c44d3490c757ef", "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4=" }, { @@ -138,7 +138,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "c198a18d289d520f462675e622a06a85404b5a0b", + "version": "288b3cf855c33e6e222dcd16a4c44d3490c757ef", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -148,7 +148,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "ae04859fc90096b7bbbe297d4fdade73f0d1f1a6", + "version": "6e3ecb473accda9c5947f78d60e84e20adfc7829", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -159,8 +159,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "ae04859fc90096b7bbbe297d4fdade73f0d1f1a6", - "sum": "hR9044bifEF7RJSZLOX9qvWHqAhuhqnqXkXgmARfneI=" + "version": "6e3ecb473accda9c5947f78d60e84e20adfc7829", + "sum": "ZZVen2GGS9xNZLODTtZSEJmgSmhfXeoU00M1ZqITN9o=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "486a463e1076bcf610b62542f53d2604a8a6788a", + "version": "3b06b97af4d146e141af92885a185891eb79a5b0", "sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=", "name": "alertmanager" }, @@ -180,7 +180,7 @@ "subdir": "docs/node-mixin" } }, - "version": "acdd9b813d71b856fe34df97caa1ed90c8587692", + "version": "c46d1f23d06491408f51845862dfbbc73b51bd6e", "sum": "xYj6VYFT/eafsbleNlC+Z2VfLy1CndyYrJs9BcTmnX8=" }, { @@ -190,7 +190,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "1e81fd216631913104b37fc6a43312cb3af0eec4", + "version": "9258e40589d971c0a009dccaa13462b87fb9454a", "sum": "CwaQpW66lHx+++sY2g4BgrUTEFZtlDnQzFjo0AlgfIg=", "name": "prometheus" }, @@ -212,7 +212,7 @@ "subdir": "mixin" } }, - "version": "4ba0ba403896e468dfda3da07ce89aa159dfbe37", + "version": "236777732278c64ca01c1c09d726f0f712c87164", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml index 7bed18395a..5871f26212 100644 --- a/manifests/alertmanager-alertmanager.yaml +++ b/manifests/alertmanager-alertmanager.yaml @@ -6,11 +6,11 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: main namespace: monitoring spec: - image: quay.io/prometheus/alertmanager:v0.27.0 + image: quay.io/prometheus/alertmanager:v0.28.0 nodeSelector: kubernetes.io/os: linux podMetadata: @@ -19,7 +19,7 @@ spec: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 replicas: 3 resources: limits: @@ -34,4 +34,4 @@ spec: runAsNonRoot: true runAsUser: 1000 serviceAccountName: alertmanager-main - version: 0.27.0 + version: 0.28.0 diff --git a/manifests/alertmanager-networkPolicy.yaml b/manifests/alertmanager-networkPolicy.yaml index ffc844eab5..01ddb6bcdb 100644 --- a/manifests/alertmanager-networkPolicy.yaml +++ b/manifests/alertmanager-networkPolicy.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: alertmanager-main namespace: monitoring spec: diff --git a/manifests/alertmanager-podDisruptionBudget.yaml b/manifests/alertmanager-podDisruptionBudget.yaml index 6dd87b3a4e..3644e4a1ab 100644 --- a/manifests/alertmanager-podDisruptionBudget.yaml +++ b/manifests/alertmanager-podDisruptionBudget.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: alertmanager-main namespace: monitoring spec: diff --git a/manifests/alertmanager-prometheusRule.yaml b/manifests/alertmanager-prometheusRule.yaml index 520e358525..8897c6182d 100644 --- a/manifests/alertmanager-prometheusRule.yaml +++ b/manifests/alertmanager-prometheusRule.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 prometheus: k8s role: alert-rules name: alertmanager-main-rules diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml index 00b0c680cf..58f492940f 100644 --- a/manifests/alertmanager-secret.yaml +++ b/manifests/alertmanager-secret.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: alertmanager-main namespace: monitoring stringData: diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml index 623b027660..7ec88ee24d 100644 --- a/manifests/alertmanager-service.yaml +++ b/manifests/alertmanager-service.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: alertmanager-main namespace: monitoring spec: diff --git a/manifests/alertmanager-serviceAccount.yaml b/manifests/alertmanager-serviceAccount.yaml index 2c2583c622..93661bfb14 100644 --- a/manifests/alertmanager-serviceAccount.yaml +++ b/manifests/alertmanager-serviceAccount.yaml @@ -7,6 +7,6 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: alertmanager-main namespace: monitoring diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml index 9bbbd07827..09a4db2087 100644 --- a/manifests/alertmanager-serviceMonitor.yaml +++ b/manifests/alertmanager-serviceMonitor.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: main app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.27.0 + app.kubernetes.io/version: 0.28.0 name: alertmanager-main namespace: monitoring spec: diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml index e5c87611b6..77094631a5 100644 --- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: alertmanagerconfigs.monitoring.coreos.com spec: diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml index ae1eefa240..aee0f6381f 100644 --- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: alertmanagers.monitoring.coreos.com spec: diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml index c646ec4f18..6bfa596189 100644 --- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: podmonitors.monitoring.coreos.com spec: diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml index 04512f95ff..12517173f9 100644 --- a/manifests/setup/0probeCustomResourceDefinition.yaml +++ b/manifests/setup/0probeCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: probes.monitoring.coreos.com spec: diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 484c08a945..bbb6b5d079 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: prometheuses.monitoring.coreos.com spec: @@ -8562,6 +8562,16 @@ spec: type: object type: object x-kubernetes-map-type: atomic + serviceName: + description: |- + The name of the service name used by the underlying StatefulSet(s) as the governing service. + If defined, the Service must be created before the Prometheus/PrometheusAgent resource in the same namespace and it must define a selector that matches the pod labels. + If empty, the operator will create and manage a headless service named `prometheus-operated` for Prometheus resources, + or `prometheus-agent-operated` for PrometheusAgent resources. + When deploying multiple Prometheus/PrometheusAgent resources in the same namespace, it is recommended to specify a different value for each. + See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details. + minLength: 1 + type: string sha: description: 'Deprecated: use ''spec.image'' instead. The image''s digest can be specified as part of the image name.' type: string diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml index 93a0f47d0e..acee16c945 100644 --- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: prometheusagents.monitoring.coreos.com spec: @@ -6955,6 +6955,16 @@ spec: type: object type: object x-kubernetes-map-type: atomic + serviceName: + description: |- + The name of the service name used by the underlying StatefulSet(s) as the governing service. + If defined, the Service must be created before the Prometheus/PrometheusAgent resource in the same namespace and it must define a selector that matches the pod labels. + If empty, the operator will create and manage a headless service named `prometheus-operated` for Prometheus resources, + or `prometheus-agent-operated` for PrometheusAgent resources. + When deploying multiple Prometheus/PrometheusAgent resources in the same namespace, it is recommended to specify a different value for each. + See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details. + minLength: 1 + type: string shards: description: |- Number of shards to distribute scraped targets onto. diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml index ccac3029b5..00c084d467 100644 --- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: prometheusrules.monitoring.coreos.com spec: diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml index 62d6e32cbe..5d4884a2a2 100644 --- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: scrapeconfigs.monitoring.coreos.com spec: diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml index 34cf94ba46..452ad147c8 100644 --- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: servicemonitors.monitoring.coreos.com spec: diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index 50bd6b3dc6..d118dfbd67 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 operator.prometheus.io/version: 0.79.2 name: thanosrulers.monitoring.coreos.com spec: