Skip to content

Commit 89b863e

Browse files
Merge pull request #2586 from machine424/promv33
MON-4150: chore: update prometheus-operator go dep
2 parents de9e434 + 974e2e6 commit 89b863e

File tree

392 files changed

+14583
-10247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

392 files changed

+14583
-10247
lines changed

Documentation/api.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ The `AlertmanagerMainConfig` resource defines settings for the Alertmanager comp
9292
| secrets | []string | Defines a list of secrets that need to be mounted into the Alertmanager. The secrets must reside within the same namespace as the Alertmanager object. They will be added as volumes named secret-<secret-name> and mounted at /etc/alertmanager/secrets/<secret-name> within the 'alertmanager' container of the Alertmanager Pods. |
9393
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) | Defines tolerations for the pods. |
9494
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines a pod's topology spread constraints. |
95-
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Alertmanager. Use this setting to configure the persistent volume claim, including storage class, volume size, and name. |
95+
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Alertmanager. Use this setting to configure the persistent volume claim, including storage class, volume size, and name. |
9696

9797
[Back to TOC](#table-of-contents)
9898

@@ -115,7 +115,7 @@ The `AlertmanagerUserWorkloadConfig` resource defines the settings for the Alert
115115
| nodeSelector | map[string]string | Defines the nodes on which the pods are scheduled. |
116116
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) | Defines tolerations for the pods. |
117117
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines a pod's topology spread constraints. |
118-
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Alertmanager. Use this setting to configure the persistent volume claim, including storage class, volume size and name. |
118+
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Alertmanager. Use this setting to configure the persistent volume claim, including storage class, volume size and name. |
119119

120120
[Back to TOC](#table-of-contents)
121121

@@ -434,7 +434,7 @@ The `PrometheusK8sConfig` resource defines settings for the Prometheus component
434434
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) | Defines tolerations for the pods. |
435435
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines the pod's topology spread constraints. |
436436
| collectionProfile | CollectionProfile | Defines the metrics collection profile that Prometheus uses to collect metrics from the platform components. Supported values are `full` or `minimal`. In the `full` profile (default), Prometheus collects all metrics that are exposed by the platform components. In the `minimal` profile, Prometheus only collects metrics necessary for the default platform alerts, recording rules, telemetry and console dashboards. |
437-
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Prometheus. Use this setting to configure the persistent volume claim, including storage class, volume size and name. |
437+
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Prometheus. Use this setting to configure the persistent volume claim, including storage class, volume size and name. |
438438

439439
[Back to TOC](#table-of-contents)
440440

@@ -502,7 +502,7 @@ The `PrometheusRestrictedConfig` resource defines the settings for the Prometheu
502502
| retentionSize | string | Defines the maximum amount of disk space used by data blocks plus the write-ahead log (WAL). Supported values are `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`, `EB`, and `EiB`. The default value is `nil`. |
503503
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) | Defines tolerations for the pods. |
504504
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines a pod's topology spread constraints. |
505-
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Prometheus. Use this setting to configure the storage class and size of a volume. |
505+
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Prometheus. Use this setting to configure the storage class and size of a volume. |
506506

507507
[Back to TOC](#table-of-contents)
508508

@@ -520,20 +520,20 @@ The `RemoteWriteSpec` resource defines the settings for remote write storage.
520520
| Property | Type | Description |
521521
| -------- | ---- | ----------- |
522522
| authorization | *monv1.SafeAuthorization | Defines the authorization settings for remote write storage. |
523-
| basicAuth | *[monv1.BasicAuth](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#basicauth) | Defines basic authentication settings for the remote write endpoint URL. |
523+
| basicAuth | *[monv1.BasicAuth](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#basicauth) | Defines basic authentication settings for the remote write endpoint URL. |
524524
| bearerTokenFile | string | Defines the file that contains the bearer token for the remote write endpoint. However, because you cannot mount secrets in a pod, in practice you can only reference the token of the service account. |
525525
| headers | map[string]string | Specifies the custom HTTP headers to be sent along with each remote write request. Headers set by Prometheus cannot be overwritten. |
526-
| metadataConfig | *[monv1.MetadataConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#metadataconfig) | Defines settings for sending series metadata to remote write storage. |
526+
| metadataConfig | *[monv1.MetadataConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#metadataconfig) | Defines settings for sending series metadata to remote write storage. |
527527
| name | string | Defines the name of the remote write queue. This name is used in metrics and logging to differentiate queues. If specified, this name must be unique. |
528528
| oauth2 | *monv1.OAuth2 | Defines OAuth2 authentication settings for the remote write endpoint. |
529529
| proxyUrl | string | Defines an optional proxy URL. If the cluster-wide proxy is enabled, it replaces the proxyUrl setting. The cluster-wide proxy supports both HTTP and HTTPS proxies, with HTTPS taking precedence. |
530-
| queueConfig | *[monv1.QueueConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#queueconfig) | Allows tuning configuration for remote write queue parameters. |
530+
| queueConfig | *[monv1.QueueConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#queueconfig) | Allows tuning configuration for remote write queue parameters. |
531531
| remoteTimeout | string | Defines the timeout value for requests to the remote write endpoint. |
532532
| sendExemplars | *bool | Enables sending exemplars via remote write. When enabled, Prometheus is configured to store a maximum of 100,000 exemplars in memory. Note that this setting only applies to user-defined monitoring. It is not applicable to default in-cluster monitoring. |
533533
| sigv4 | *monv1.Sigv4 | Defines AWS Signature Version 4 authentication settings. |
534-
| tlsConfig | *[monv1.SafeTLSConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#safetlsconfig) | Defines TLS authentication settings for the remote write endpoint. |
534+
| tlsConfig | *[monv1.SafeTLSConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#safetlsconfig) | Defines TLS authentication settings for the remote write endpoint. |
535535
| url | string | Defines the URL of the remote write endpoint to which samples will be sent. |
536-
| writeRelabelConfigs | [][monv1.RelabelConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#relabelconfig) | Defines the list of remote write relabel configurations. |
536+
| writeRelabelConfigs | [][monv1.RelabelConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#relabelconfig) | Defines the list of remote write relabel configurations. |
537537

538538
[Back to TOC](#table-of-contents)
539539

@@ -619,7 +619,7 @@ The `ThanosRulerConfig` resource defines configuration for the Thanos Ruler inst
619619
| retention | string | Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `24h`. |
620620
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) | Defines tolerations for the pods. |
621621
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines topology spread constraints for the pods. |
622-
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.76.0/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Thanos Ruler. Use this setting to configure the storage class and size of a volume. |
622+
| volumeClaimTemplate | *[monv1.EmbeddedPersistentVolumeClaim](https://github.com/prometheus-operator/prometheus-operator/blob/v0.80.1/Documentation/api.md#embeddedpersistentvolumeclaim) | Defines persistent storage for Thanos Ruler. Use this setting to configure the storage class and size of a volume. |
623623

624624
[Back to TOC](#table-of-contents)
625625

go.mod

+19-19
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ require (
1818
github.com/openshift/api v0.0.0-20250320170726-75d64d71980b
1919
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
2020
github.com/openshift/library-go v0.0.0-20250402180609-ce2ba53fb2a4
21-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.0
22-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.0
21+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1
22+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.80.1
2323
github.com/prometheus/alertmanager v0.27.0
2424
github.com/prometheus/client_golang v1.20.4
2525
github.com/prometheus/common v0.60.0
2626
github.com/prometheus/prometheus v0.54.1
2727
github.com/stretchr/testify v1.9.0
28-
golang.org/x/net v0.30.0
29-
golang.org/x/sync v0.8.0
30-
golang.org/x/text v0.19.0
28+
golang.org/x/net v0.34.0
29+
golang.org/x/sync v0.10.0
30+
golang.org/x/text v0.21.0
3131
gopkg.in/yaml.v2 v2.4.0
3232
gopkg.in/yaml.v3 v3.0.1
3333
k8s.io/api v0.32.1
@@ -40,9 +40,9 @@ require (
4040
k8s.io/klog/v2 v2.130.1
4141
k8s.io/kube-aggregator v0.32.1
4242
k8s.io/metrics v0.31.1
43-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
44-
sigs.k8s.io/controller-runtime v0.19.0
45-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
43+
k8s.io/utils v0.0.0-20241210054802-24370beab758
44+
sigs.k8s.io/controller-runtime v0.20.1
45+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8
4646
sigs.k8s.io/yaml v1.4.0
4747
)
4848

@@ -81,9 +81,9 @@ require (
8181
github.com/gogo/protobuf v1.3.2 // indirect
8282
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
8383
github.com/golang/protobuf v1.5.4 // indirect
84-
github.com/google/btree v1.0.1 // indirect
84+
github.com/google/btree v1.1.3 // indirect
8585
github.com/google/cel-go v0.22.0 // indirect
86-
github.com/google/gnostic-models v0.6.8 // indirect
86+
github.com/google/gnostic-models v0.6.9 // indirect
8787
github.com/google/go-cmp v0.6.0 // indirect
8888
github.com/google/gofuzz v1.2.0 // indirect
8989
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
@@ -96,7 +96,7 @@ require (
9696
github.com/json-iterator/go v1.1.12 // indirect
9797
github.com/klauspost/compress v1.17.10 // indirect
9898
github.com/kylelemons/godebug v1.1.0 // indirect
99-
github.com/mailru/easyjson v0.7.7 // indirect
99+
github.com/mailru/easyjson v0.9.0 // indirect
100100
github.com/mitchellh/mapstructure v1.5.0 // indirect
101101
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
102102
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -130,24 +130,24 @@ require (
130130
go.uber.org/atomic v1.11.0 // indirect
131131
go.uber.org/multierr v1.11.0 // indirect
132132
go.uber.org/zap v1.27.0 // indirect
133-
golang.org/x/crypto v0.28.0 // indirect
133+
golang.org/x/crypto v0.32.0 // indirect
134134
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
135-
golang.org/x/oauth2 v0.23.0 // indirect
136-
golang.org/x/sys v0.26.0 // indirect
137-
golang.org/x/term v0.25.0 // indirect
138-
golang.org/x/time v0.7.0 // indirect
135+
golang.org/x/oauth2 v0.25.0 // indirect
136+
golang.org/x/sys v0.29.0 // indirect
137+
golang.org/x/term v0.28.0 // indirect
138+
golang.org/x/time v0.9.0 // indirect
139139
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
140140
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
141141
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
142142
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
143143
google.golang.org/grpc v1.65.0 // indirect
144-
google.golang.org/protobuf v1.35.1 // indirect
144+
google.golang.org/protobuf v1.36.3 // indirect
145145
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
146146
gopkg.in/inf.v0 v0.9.1 // indirect
147147
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
148148
k8s.io/kms v0.32.1 // indirect
149-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
149+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
150150
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
151151
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
152-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
152+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
153153
)

0 commit comments

Comments
 (0)