From c7717aca8a8d2f5f2593a11b8fdcd6b0c390f207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Fri, 18 Jul 2025 19:07:45 +0200 Subject: [PATCH 1/5] Fix no-storage.tsdb.allow-overlapping-compaction argument Signed-off-by: Simon Pasquier --- pkg/prometheus/server/statefulset.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/prometheus/server/statefulset.go b/pkg/prometheus/server/statefulset.go index bb302153ba0..dafaef82672 100644 --- a/pkg/prometheus/server/statefulset.go +++ b/pkg/prometheus/server/statefulset.go @@ -246,7 +246,7 @@ func makeStatefulSetSpec( if cpf.TSDB != nil && cpf.TSDB.OutOfOrderTimeWindow != nil && compactionDisabled(p) && cg.WithMinimumVersion("2.55.0").IsCompatible() { - promArgs = append(promArgs, monitoringv1.Argument{Name: "storage.tsdb.allow-overlapping-compaction"}) + promArgs = append(promArgs, monitoringv1.Argument{Name: "no-storage.tsdb.allow-overlapping-compaction"}) } var watchedDirectories []string From 00cb35f414679af4c3cdbfe071db5ad4da875ef2 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 28 Jul 2025 17:11:47 +0200 Subject: [PATCH 2/5] Fix test Signed-off-by: Simon Pasquier --- pkg/prometheus/server/statefulset_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/prometheus/server/statefulset_test.go b/pkg/prometheus/server/statefulset_test.go index 3e751bf9942..e6911fa529c 100644 --- a/pkg/prometheus/server/statefulset_test.go +++ b/pkg/prometheus/server/statefulset_test.go @@ -1566,7 +1566,7 @@ func TestTSDBAllowOverlappingBlocks(t *testing.T) { } func TestTSDBAllowOverlappingCompaction(t *testing.T) { - expectedArg := "--storage.tsdb.allow-overlapping-compaction" + expectedArg := "--no-storage.tsdb.allow-overlapping-compaction" tests := []struct { name string version string From 01cad74a87dbcb406f3905466060912c0e14f557 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 28 Jul 2025 17:16:44 +0200 Subject: [PATCH 3/5] Update CHANGELOG.md Signed-off-by: Simon Pasquier --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfcec03d8fc..f84b3b87483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased +* [CHANGE/BUGFIX] Disable compaction of overlapping blocks when Thanos sidecar is configured with object storage. #7747 + ## 0.84.0 / 2025-07-14 * [FEATURE] Add `telegram` field to AlertManager CRD global configuration. #7631 From 7201f4a51c8e54b5b820c33666577c0a8454c1e3 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 29 Jul 2025 13:47:59 +0200 Subject: [PATCH 4/5] fix: log only valid resources Signed-off-by: Simon Pasquier --- CHANGELOG.md | 1 + pkg/prometheus/resource_selector.go | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f84b3b87483..f0df3edaec8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Unreleased * [CHANGE/BUGFIX] Disable compaction of overlapping blocks when Thanos sidecar is configured with object storage. #7747 +* [BUGFIX] Log only selected resources which are valid. #7749 ## 0.84.0 / 2025-07-14 diff --git a/pkg/prometheus/resource_selector.go b/pkg/prometheus/resource_selector.go index 75665e171b2..9395b1042cb 100644 --- a/pkg/prometheus/resource_selector.go +++ b/pkg/prometheus/resource_selector.go @@ -174,8 +174,11 @@ func selectObjects[T configurationResource]( } } - var rejected int - res := make(ResourcesSelection[T], 0, len(objects)) + var ( + rejected int + valid []string + res = make(ResourcesSelection[T], 0, len(objects)) + ) for namespaceAndName, obj := range objects { var reason string o := obj.(T) @@ -185,7 +188,10 @@ func selectObjects[T configurationResource]( reason = invalidConfiguration logger.Warn("skipping object", "error", err.Error(), "object", namespaceAndName) rs.eventRecorder.Eventf(obj, v1.EventTypeWarning, operator.InvalidConfigurationEvent, "%q was rejected due to invalid configuration: %v", namespaceAndName, err) + } else { + valid = append(valid, namespaceAndName) } + res = append(res, struct { resource T key string @@ -199,11 +205,7 @@ func selectObjects[T configurationResource]( }) } - keys := []string{} - for _, r := range res { - keys = append(keys, r.key) - } - logger.Debug("objects selected", "objects", strings.Join(keys, ",")) + logger.Debug("valid objects selected", "objects", strings.Join(valid, ",")) if pKey, ok := rs.accessor.MetaNamespaceKey(rs.p); ok { rs.metrics.SetSelectedResources(pKey, kind, len(res)) From 3786f498d225b90913ee4340820b0f856c5e0977 Mon Sep 17 00:00:00 2001 From: Jayapriya Pai Date: Wed, 6 Aug 2025 08:31:01 +0530 Subject: [PATCH 5/5] chore: cut v0.84.1 Signed-off-by: Jayapriya Pai --- CHANGELOG.md | 2 +- Documentation/platform/operator.md | 2 +- Documentation/platform/prometheus-agent.md | 2 +- Documentation/platform/rbac.md | 6 ++-- Documentation/platform/webhook.md | 10 +++--- VERSION | 2 +- bundle.yaml | 36 +++++++++---------- example/admission-webhook/deployment.yaml | 6 ++-- .../pod-disruption-budget.yaml | 2 +- .../admission-webhook/service-account.yaml | 2 +- .../admission-webhook/service-monitor.yaml | 4 +-- example/admission-webhook/service.yaml | 2 +- .../alertmanager-crd-conversion/patch.json | 2 +- ...toring.coreos.com_alertmanagerconfigs.yaml | 2 +- .../monitoring.coreos.com_alertmanagers.yaml | 2 +- .../monitoring.coreos.com_podmonitors.yaml | 2 +- .../monitoring.coreos.com_probes.yaml | 2 +- ...onitoring.coreos.com_prometheusagents.yaml | 2 +- .../monitoring.coreos.com_prometheuses.yaml | 2 +- ...monitoring.coreos.com_prometheusrules.yaml | 2 +- .../monitoring.coreos.com_scrapeconfigs.yaml | 2 +- ...monitoring.coreos.com_servicemonitors.yaml | 2 +- .../monitoring.coreos.com_thanosrulers.yaml | 2 +- ...metheus-operator-cluster-role-binding.yaml | 2 +- .../prometheus-operator-cluster-role.yaml | 2 +- .../prometheus-operator-deployment.yaml | 8 ++--- .../prometheus-operator-service-account.yaml | 2 +- .../prometheus-operator-service-monitor.yaml | 4 +-- .../prometheus-operator-service.yaml | 2 +- go.mod | 4 +-- .../alertmanagerconfigs-crd.json | 2 +- .../alertmanagers-crd.json | 2 +- .../prometheus-operator/podmonitors-crd.json | 2 +- jsonnet/prometheus-operator/probes-crd.json | 2 +- .../prometheusagents-crd.json | 2 +- .../prometheus-operator/prometheuses-crd.json | 2 +- .../prometheusrules-crd.json | 2 +- .../scrapeconfigs-crd.json | 2 +- .../servicemonitors-crd.json | 2 +- .../prometheus-operator/thanosrulers-crd.json | 2 +- pkg/client/go.mod | 2 +- 41 files changed, 72 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0df3edaec8..4e7b747e7c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Unreleased +## 0.84.1 / 2025-08-06 * [CHANGE/BUGFIX] Disable compaction of overlapping blocks when Thanos sidecar is configured with object storage. #7747 * [BUGFIX] Log only selected resources which are valid. #7749 diff --git a/Documentation/platform/operator.md b/Documentation/platform/operator.md index aa5dd20ada1..09be36d40b9 100644 --- a/Documentation/platform/operator.md +++ b/Documentation/platform/operator.md @@ -83,7 +83,7 @@ Usage of ./operator: -namespaces value Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with --deny-namespaces. -prometheus-config-reloader string - Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.84.0") + Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.84.1") -prometheus-default-base-image string Prometheus default base image (path without tag/version) (default "quay.io/prometheus/prometheus") -prometheus-instance-namespaces value diff --git a/Documentation/platform/prometheus-agent.md b/Documentation/platform/prometheus-agent.md index bdcf6d352ba..d6bb0480476 100644 --- a/Documentation/platform/prometheus-agent.md +++ b/Documentation/platform/prometheus-agent.md @@ -26,7 +26,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator rules: - apiGroups: diff --git a/Documentation/platform/rbac.md b/Documentation/platform/rbac.md index a09e419a631..7af2f3a94b1 100644 --- a/Documentation/platform/rbac.md +++ b/Documentation/platform/rbac.md @@ -26,7 +26,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator rules: - apiGroups: @@ -208,7 +208,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default ``` @@ -224,7 +224,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/Documentation/platform/webhook.md b/Documentation/platform/webhook.md index d21b2191dab..917d55296c8 100644 --- a/Documentation/platform/webhook.md +++ b/Documentation/platform/webhook.md @@ -86,7 +86,7 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default ``` @@ -97,7 +97,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default spec: @@ -114,7 +114,7 @@ spec: kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 spec: affinity: podAntiAffinity: @@ -131,7 +131,7 @@ spec: - --web.enable-tls=true - --web.cert-file=/etc/tls/private/tls.crt - --web.key-file=/etc/tls/private/tls.key - image: quay.io/prometheus-operator/admission-webhook:v0.84.0 + image: quay.io/prometheus-operator/admission-webhook:v0.84.1 name: prometheus-operator-admission-webhook ports: - containerPort: 8443 @@ -179,7 +179,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/VERSION b/VERSION index 09c49413b06..e1858a2cff5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.84.0 +0.84.1 diff --git a/bundle.yaml b/bundle.yaml index 52b19967415..3261b1578db 100644 --- a/bundle.yaml +++ b/bundle.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -10805,7 +10805,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -20325,7 +20325,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -21585,7 +21585,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -22814,7 +22814,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -33772,7 +33772,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -46985,7 +46985,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -47145,7 +47145,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -59691,7 +59691,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -61068,7 +61068,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -70356,7 +70356,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -70373,7 +70373,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator rules: - apiGroups: @@ -70482,7 +70482,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default spec: @@ -70498,19 +70498,19 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.1 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.84.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.84.1 name: prometheus-operator ports: - containerPort: 8080 @@ -70544,7 +70544,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default --- @@ -70554,7 +70554,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default spec: diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml index 577a42ad404..472c0fa30cb 100644 --- a/example/admission-webhook/deployment.yaml +++ b/example/admission-webhook/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default spec: @@ -20,7 +20,7 @@ spec: kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 spec: affinity: podAntiAffinity: @@ -37,7 +37,7 @@ spec: - --web.enable-tls=true - --web.cert-file=/etc/tls/private/tls.crt - --web.key-file=/etc/tls/private/tls.key - image: quay.io/prometheus-operator/admission-webhook:v0.84.0 + image: quay.io/prometheus-operator/admission-webhook:v0.84.1 name: prometheus-operator-admission-webhook ports: - containerPort: 8443 diff --git a/example/admission-webhook/pod-disruption-budget.yaml b/example/admission-webhook/pod-disruption-budget.yaml index ef798258e92..50d96bad3b3 100644 --- a/example/admission-webhook/pod-disruption-budget.yaml +++ b/example/admission-webhook/pod-disruption-budget.yaml @@ -3,7 +3,7 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/example/admission-webhook/service-account.yaml b/example/admission-webhook/service-account.yaml index cc9653f1a45..bce6cb9d718 100644 --- a/example/admission-webhook/service-account.yaml +++ b/example/admission-webhook/service-account.yaml @@ -4,6 +4,6 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default diff --git a/example/admission-webhook/service-monitor.yaml b/example/admission-webhook/service-monitor.yaml index d4db68f610f..997b5119f3f 100644 --- a/example/admission-webhook/service-monitor.yaml +++ b/example/admission-webhook/service-monitor.yaml @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default spec: @@ -13,4 +13,4 @@ spec: selector: matchLabels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 diff --git a/example/admission-webhook/service.yaml b/example/admission-webhook/service.yaml index 218ea172916..c2740661cb1 100644 --- a/example/admission-webhook/service.yaml +++ b/example/admission-webhook/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/example/alertmanager-crd-conversion/patch.json b/example/alertmanager-crd-conversion/patch.json index 6d98a91727d..4a5a74d3503 100644 --- a/example/alertmanager-crd-conversion/patch.json +++ b/example/alertmanager-crd-conversion/patch.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml index 7999e61a79e..4d58d491adc 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml index b9c954f5526..802ac3b3468 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml index f16b139c4f3..7c07340c1f3 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml index fce12945fb4..4bc6b8aa32d 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml index 6019006044d..2fd7ed5a12f 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml index 9fcfbcb6957..51323ae89f4 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml index 2d2c6fb5a4f..e3fb64ac1d9 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml index fa6be7d6022..6311a0b92b8 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml index 567e12d03be..f9e6cf0bffb 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml index 3a47381cb71..d41695eb3d3 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - operator.prometheus.io/version: 0.84.0 + operator.prometheus.io/version: 0.84.1 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml index 1bbf898aa82..ab5b7228c74 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml index 22fa3d2e338..cf66bf7a709 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator rules: - apiGroups: diff --git a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml index c6ee5a49bb0..a454218f89d 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml +++ b/example/rbac/prometheus-operator/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: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default spec: @@ -20,19 +20,19 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.1 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.84.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.84.1 name: prometheus-operator ports: - containerPort: 8080 diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml index 6cff446731e..73a430901d5 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml @@ -5,6 +5,6 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml index 464b4136647..e2a3f10d0b8 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default spec: @@ -15,4 +15,4 @@ spec: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.84.0 + app.kubernetes.io/version: 0.84.1 diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-operator-service.yaml index 58912200028..76df3acb718 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-service.yaml +++ b/example/rbac/prometheus-operator/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: 0.84.0 + app.kubernetes.io/version: 0.84.1 name: prometheus-operator namespace: default spec: diff --git a/go.mod b/go.mod index 419868ad0c0..5f21557340a 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( github.com/mitchellh/hashstructure v1.1.0 github.com/oklog/run v1.2.0 github.com/prometheus-community/prom-label-proxy v0.11.1 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.0 - github.com/prometheus-operator/prometheus-operator/pkg/client v0.84.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1 + github.com/prometheus-operator/prometheus-operator/pkg/client v0.84.1 github.com/prometheus/alertmanager v0.28.1 github.com/prometheus/client_golang v1.22.0 github.com/prometheus/common v0.65.0 diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index 06b8172072e..487a7a22fdd 100644 --- a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/alertmanagers-crd.json b/jsonnet/prometheus-operator/alertmanagers-crd.json index 5e105bc5cd2..f55e7342d83 100644 --- a/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/podmonitors-crd.json b/jsonnet/prometheus-operator/podmonitors-crd.json index 28b508d7aaf..654351753c9 100644 --- a/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/jsonnet/prometheus-operator/podmonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/probes-crd.json b/jsonnet/prometheus-operator/probes-crd.json index 8fb2bc27f6a..4d869e2dcfc 100644 --- a/jsonnet/prometheus-operator/probes-crd.json +++ b/jsonnet/prometheus-operator/probes-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "probes.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusagents-crd.json b/jsonnet/prometheus-operator/prometheusagents-crd.json index 2c375eb99e0..ae4ec1212eb 100644 --- a/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "prometheusagents.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheuses-crd.json b/jsonnet/prometheus-operator/prometheuses-crd.json index a1a57f42a94..90fda55dfb6 100644 --- a/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/jsonnet/prometheus-operator/prometheuses-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "prometheuses.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusrules-crd.json b/jsonnet/prometheus-operator/prometheusrules-crd.json index 4019f168505..24831c5d2f5 100644 --- a/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 9bf09b59d7d..d23431b6489 100644 --- a/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/servicemonitors-crd.json b/jsonnet/prometheus-operator/servicemonitors-crd.json index 962b53d6ddb..6b09a05f6aa 100644 --- a/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/thanosrulers-crd.json b/jsonnet/prometheus-operator/thanosrulers-crd.json index 8f42cb39895..d851cb9032b 100644 --- a/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.18.0", - "operator.prometheus.io/version": "0.84.0" + "operator.prometheus.io/version": "0.84.1" }, "name": "thanosrulers.monitoring.coreos.com" }, diff --git a/pkg/client/go.mod b/pkg/client/go.mod index 1fedc0ac4c5..377d004dec6 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -5,7 +5,7 @@ go 1.24.0 toolchain go1.24.3 require ( - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1 k8s.io/api v0.33.2 k8s.io/apiextensions-apiserver v0.33.2 k8s.io/apimachinery v0.33.2