From eddb948ce3393d37a0053b3d40f1f072c6b8b060 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:07:09 +0200 Subject: [PATCH] [bot] [main] Automated version update (#2443) Co-authored-by: Prometheus Operator Bot --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 30 +- manifests/blackboxExporter-deployment.yaml | 2 +- manifests/kubeStateMetrics-deployment.yaml | 4 +- manifests/nodeExporter-daemonset.yaml | 2 +- manifests/prometheusOperator-deployment.yaml | 2 +- ...managerConfigCustomResourceDefinition.yaml | 2 +- ...0alertmanagerCustomResourceDefinition.yaml | 2 +- .../0podmonitorCustomResourceDefinition.yaml | 2 +- .../setup/0probeCustomResourceDefinition.yaml | 2 +- .../0prometheusCustomResourceDefinition.yaml | 11 +- ...ometheusagentCustomResourceDefinition.yaml | 22 +- ...rometheusruleCustomResourceDefinition.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 2903 ++++++++++++----- ...ervicemonitorCustomResourceDefinition.yaml | 2 +- .../0thanosrulerCustomResourceDefinition.yaml | 2 +- 16 files changed, 2141 insertions(+), 851 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 698b746b56..4f09a46b01 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -7,7 +7,7 @@ "prometheus": "2.52.0", "prometheusAdapter": "0.12.0", "prometheusOperator": "0.74.0", - "kubeRbacProxy": "0.17.1", + "kubeRbacProxy": "0.18.0", "configmapReload": "0.13.0", "pyrra": "0.6.4" } diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index e16fba5ef2..22a82021ce 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "0b2f15f616be1c18ef49d24178055b724b82e220", + "version": "8a0054fecb0d52d8c7d513652c770a533a4c1037", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -58,7 +58,7 @@ "subdir": "gen/grafonnet-latest" } }, - "version": "fb76e2b3e511769900d9ec7bbf9dd77b5051ecfe", + "version": "119d65363dff84a1976bba609f2ac3a8f450e760", "sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI=" }, { @@ -68,7 +68,7 @@ "subdir": "gen/grafonnet-v10.0.0" } }, - "version": "fb76e2b3e511769900d9ec7bbf9dd77b5051ecfe", + "version": "119d65363dff84a1976bba609f2ac3a8f450e760", "sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0=" }, { @@ -78,8 +78,8 @@ "subdir": "gen/grafonnet-v11.0.0" } }, - "version": "fb76e2b3e511769900d9ec7bbf9dd77b5051ecfe", - "sum": "NFIxfF9YprxwmcpqC5f05faEj4Gl740Abs6YDUun0M4=" + "version": "119d65363dff84a1976bba609f2ac3a8f450e760", + "sum": "Fuo+qTZZzF+sHDBWX/8fkPsUmwW6qhH8hRVz45HznfI=" }, { "source": { @@ -98,7 +98,7 @@ "subdir": "mixin-utils" } }, - "version": "6db8202a2360090ff19144c48a14b9fb1a314625", + "version": "553b9c250567ff618f70f3ff681eb2804dbb752d", "sum": "A0f0G3aJEkdu5sqHXtizHDyU1jOSx6VuEXLRlI9Psp8=" }, { @@ -138,7 +138,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "85762cdf9790999957d8e9afdfc7253b1fa705db", + "version": "7995d5fd23bcff7ae24ab6849f7c393d262fb025", "sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0=" }, { @@ -148,7 +148,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "85762cdf9790999957d8e9afdfc7253b1fa705db", + "version": "7995d5fd23bcff7ae24ab6849f7c393d262fb025", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -158,7 +158,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "2adc2bade4b143c74b3af1d766298358781b9edb", + "version": "0d8575e0f5a801d368f181b4f9350c05d7adb5d5", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -169,8 +169,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "2adc2bade4b143c74b3af1d766298358781b9edb", - "sum": "dep5QbZrBzG8kBt9x8xqRSm6RWBsBH9IRh3BKedcY7o=" + "version": "0d8575e0f5a801d368f181b4f9350c05d7adb5d5", + "sum": "jmdawkwvv5xPgbtNpOgH7QlpbSX/giVhdu3OEfNOO6Q=" }, { "source": { @@ -179,7 +179,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "b67bde8cf981dd2f5e86cbb7b886074bf24d7a9c", + "version": "b59669f43821a59b89e846ff2f89c2f171fde336", "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=", "name": "alertmanager" }, @@ -190,7 +190,7 @@ "subdir": "docs/node-mixin" } }, - "version": "6603633c0e758d7876519cdf5804e5138e3eb1d7", + "version": "dc185bc0f640293944f332745e94f3278dbcaab0", "sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns=" }, { @@ -200,7 +200,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "bfdca40fd2fa78c7d80f335c0b67cdaa2b5432fd", + "version": "08621bebe976c683683aa8198303bb000381be57", "sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=", "name": "prometheus" }, @@ -222,7 +222,7 @@ "subdir": "mixin" } }, - "version": "863d914432e89683658bd7f9d4f15b9667329674", + "version": "b72f7da3407a9d47468453684e8e2dee1aea2289", "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=", "name": "thanos-mixin" }, diff --git a/manifests/blackboxExporter-deployment.yaml b/manifests/blackboxExporter-deployment.yaml index 5c1c86159f..99992081cb 100644 --- a/manifests/blackboxExporter-deployment.yaml +++ b/manifests/blackboxExporter-deployment.yaml @@ -86,7 +86,7 @@ spec: - --secure-listen-address=:9115 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:19115/ - image: quay.io/brancz/kube-rbac-proxy:v0.17.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.0 name: kube-rbac-proxy ports: - containerPort: 9115 diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml index 910a9fa2c8..aa57b5b5e9 100644 --- a/manifests/kubeStateMetrics-deployment.yaml +++ b/manifests/kubeStateMetrics-deployment.yaml @@ -56,7 +56,7 @@ spec: - --secure-listen-address=:8443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8081/ - image: quay.io/brancz/kube-rbac-proxy:v0.17.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.0 name: kube-rbac-proxy-main ports: - containerPort: 8443 @@ -83,7 +83,7 @@ spec: - --secure-listen-address=:9443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8082/ - image: quay.io/brancz/kube-rbac-proxy:v0.17.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.0 name: kube-rbac-proxy-self ports: - containerPort: 9443 diff --git a/manifests/nodeExporter-daemonset.yaml b/manifests/nodeExporter-daemonset.yaml index df874b1b52..fe944d2c78 100644 --- a/manifests/nodeExporter-daemonset.yaml +++ b/manifests/nodeExporter-daemonset.yaml @@ -72,7 +72,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: quay.io/brancz/kube-rbac-proxy:v0.17.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.0 name: kube-rbac-proxy ports: - containerPort: 9100 diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml index 84f327320c..a64ef32c94 100644 --- a/manifests/prometheusOperator-deployment.yaml +++ b/manifests/prometheusOperator-deployment.yaml @@ -55,7 +55,7 @@ spec: - --secure-listen-address=:8443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8080/ - image: quay.io/brancz/kube-rbac-proxy:v0.17.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.0 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml index 0adaad2b77..4070574d18 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.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 operator.prometheus.io/version: 0.74.0 name: alertmanagerconfigs.monitoring.coreos.com spec: diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml index b647863b42..5b13d50c72 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.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 operator.prometheus.io/version: 0.74.0 name: alertmanagers.monitoring.coreos.com spec: diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml index ae7e9f25f1..c03e9630a2 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.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 operator.prometheus.io/version: 0.74.0 name: podmonitors.monitoring.coreos.com spec: diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml index 5118a41e6c..b380646166 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.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 operator.prometheus.io/version: 0.74.0 name: probes.monitoring.coreos.com spec: diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 488378d0ee..508a978751 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.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 operator.prometheus.io/version: 0.74.0 name: prometheuses.monitoring.coreos.com spec: @@ -5177,10 +5177,11 @@ spec: type: object overrideHonorLabels: description: |- - When true, Prometheus resolves label conflicts by renaming the labels in - the scraped data to "exported_