Skip to content

chore: update to [obo]-prometheus-operator v0.89.0 #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Feb 26, 2026
Merged

chore: update to [obo]-prometheus-operator v0.89.0 #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7d1324
chore: update to [obo]-prometheus-operator v0.89.0
jan--f Feb 24, 2026
3b4865d
chore: adjust use for CAFile and TLSConfig fields for po 0.89.0
jan--f Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 258 additions & 8 deletions bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 80 additions & 4 deletions bundle/manifests/monitoring.rhobs_alertmanagers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: Experimental-SSA
operator.prometheus.io/version: 0.87.0-rhobs1
operator.prometheus.io/version: 0.89.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -2320,7 +2320,7 @@ spec:
type: string
type: object
webex:
description: webex defines the default configuration for Jira.
description: webex defines the default configuration for Webex.
properties:
apiURL:
description: |-
Expand Down Expand Up @@ -4520,6 +4520,17 @@ spec:
x-kubernetes-list-map-keys:
- ip
x-kubernetes-list-type: map
hostNetwork:
description: |-
hostNetwork controls whether the pod may use the node network namespace.

Make sure to understand the security implications if you want to enable
it (https://kubernetes.io/docs/concepts/configuration/overview/).

When hostNetwork is enabled, this will set the DNS policy to
`ClusterFirstWithHostNet` automatically (unless `.spec.dnsPolicy` is set
to a different value).
type: boolean
hostUsers:
description: |-
hostUsers supports the user space in Kubernetes.
Expand Down Expand Up @@ -6142,10 +6153,18 @@ spec:
type: string
minReadySeconds:
description: |-
minReadySeconds defines the minimum number of seconds for which a newly created pod should be ready
without any of its container crashing for it to be considered available.
minReadySeconds defines the minimum number of seconds for which a newly
created pod should be ready without any of its container crashing for it
to be considered available.

If unset, pods will be considered available as soon as they are ready.

When the Alertmanager version is greater than or equal to v0.30.0, the
duration is also used to delay the first flush of the aggregation
groups. This delay helps ensuring that all alerts have been resent by
the Prometheus instances to Alertmanager after a roll-out. It is
possible to override this behavior passing a custom value via
`.spec.additionalArgs`.
format: int32
minimum: 0
type: integer
Expand Down Expand Up @@ -6183,6 +6202,21 @@ spec:
the replica count to be deleted.
type: string
type: object
podManagementPolicy:
description: |-
podManagementPolicy defines the policy for creating/deleting pods when
scaling up and down.

Unlike the default StatefulSet behavior, the default policy is
`Parallel` to avoid manual intervention in case a pod gets stuck during
a rollout.

Note that updating this value implies the recreation of the StatefulSet
which incurs a service outage.
enum:
- OrderedReady
- Parallel
type: string
podMetadata:
description: |-
podMetadata defines labels and annotations which are propagated to the Alertmanager pods.
Expand Down Expand Up @@ -7522,6 +7556,48 @@ spec:
- whenUnsatisfiable
type: object
type: array
updateStrategy:
description: |-
updateStrategy indicates the strategy that will be employed to update
Pods in the StatefulSet when a revision is made to statefulset's Pod
Template.

The default strategy is RollingUpdate.
properties:
rollingUpdate:
description: rollingUpdate is used to communicate parameters when
type is RollingUpdate.
properties:
maxUnavailable:
anyOf:
- type: integer
- type: string
description: |-
maxUnavailable is the maximum number of pods that can be unavailable
during the update. The value can be an absolute number (ex: 5) or a
percentage of desired pods (ex: 10%). Absolute number is calculated from
percentage by rounding up. This can not be 0. Defaults to 1. This field
is alpha-level and is only honored by servers that enable the
MaxUnavailableStatefulSet feature. The field applies to all pods in the
range 0 to Replicas-1. That means if there is any unavailable pod in
the range 0 to Replicas-1, it will be counted towards MaxUnavailable.
x-kubernetes-int-or-string: true
type: object
type:
description: |-
type indicates the type of the StatefulSetUpdateStrategy.

Default is RollingUpdate.
enum:
- OnDelete
- RollingUpdate
type: string
required:
- type
type: object
x-kubernetes-validations:
- message: rollingUpdate requires type to be RollingUpdate
rule: '!(self.type != ''RollingUpdate'' && has(self.rollingUpdate))'
version:
description: version the cluster should be on.
type: string
Expand Down
7 changes: 6 additions & 1 deletion bundle/manifests/monitoring.rhobs_podmonitors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.87.0-rhobs1
operator.prometheus.io/version: 0.89.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -1188,6 +1188,11 @@ spec:

Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
type: boolean
scrapeNativeHistograms:
description: |-
scrapeNativeHistograms defines whether to enable scraping of native histograms.
It requires Prometheus >= v3.8.0.
type: boolean
scrapeProtocols:
description: |-
scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the
Expand Down
49 changes: 38 additions & 11 deletions bundle/manifests/monitoring.rhobs_probes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
observability.openshift.io/api-support: TechPreview
operator.prometheus.io/version: 0.87.0-rhobs1
operator.prometheus.io/version: 0.89.0-rhobs1
creationTimestamp: null
labels:
app.kubernetes.io/part-of: observability-operator
Expand Down Expand Up @@ -54,7 +54,11 @@ spec:
for target discovery by Prometheus.
properties:
authorization:
description: authorization section for this endpoint
description: |-
authorization configures the Authorization header credentials used by
the client.

Cannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`.
properties:
credentials:
description: credentials defines a key of a Secret in the namespace
Expand Down Expand Up @@ -92,8 +96,10 @@ spec:
type: object
basicAuth:
description: |-
basicAuth allow an endpoint to authenticate over basic authentication.
More info: https://prometheus.io/docs/operating/configuration/#endpoint
basicAuth defines the Basic Authentication credentials used by the
client.

Cannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`.
properties:
password:
description: |-
Expand Down Expand Up @@ -150,9 +156,14 @@ spec:
type: object
bearerTokenSecret:
description: |-
bearerTokenSecret defines the secret to mount to read bearer token for scraping targets. The secret
needs to be in the same namespace as the probe and accessible by
the Prometheus Operator.
bearerTokenSecret defines a key of a Secret containing the bearer token
used by the client for authentication. The secret needs to be in the
same namespace as the custom resource and readable by the Prometheus
Operator.

Cannot be set at the same time as `authorization`, `basicAuth` or `oauth2`.

Deprecated: use `authorization` instead.
properties:
key:
description: The key of the secret to select from. Must be a
Expand All @@ -179,6 +190,9 @@ spec:
convertClassicHistogramsToNHCB defines whether to convert all scraped classic histograms into a native histogram with custom buckets.
It requires Prometheus >= v3.0.0.
type: boolean
enableHttp2:
description: enableHttp2 can be used to disable HTTP2.
type: boolean
fallbackScrapeProtocol:
description: |-
fallbackScrapeProtocol defines the protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
Expand All @@ -191,6 +205,11 @@ spec:
- PrometheusText0.0.4
- PrometheusText1.0.0
type: string
followRedirects:
description: |-
followRedirects defines whether the client should follow HTTP 3xx
redirects.
type: boolean
interval:
description: |-
interval at which targets are probed using the configured prober.
Expand Down Expand Up @@ -338,8 +357,12 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
oauth2:
description: oauth2 for the URL. Only valid in Prometheus versions
2.27.0 and newer.
description: |-
oauth2 defines the OAuth2 settings used by the client.

It requires Prometheus >= 2.27.0.

Cannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`.
properties:
clientId:
description: |-
Expand Down Expand Up @@ -793,6 +816,11 @@ spec:

Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
type: boolean
scrapeNativeHistograms:
description: |-
scrapeNativeHistograms defines whether to enable scraping of native histograms.
It requires Prometheus >= v3.8.0.
type: boolean
scrapeProtocols:
description: |-
scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the
Expand Down Expand Up @@ -1109,8 +1137,7 @@ spec:
type: object
type: object
tlsConfig:
description: tlsConfig defines the TLS configuration to use when scraping
the endpoint.
description: tlsConfig defines the TLS configuration used by the client.
properties:
ca:
description: ca defines the Certificate authority used when verifying
Expand Down
Loading