Skip to content

MON-4255: Bump prometheus-operator dependencies to v0.84.0 #2619

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
merged 1 commit into from
Jul 16, 2025
Merged

MON-4255: Bump prometheus-operator dependencies to v0.84.0 #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions assets/prometheus-operator-user-workload/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ rules:
- thanosrulers/finalizers
- thanosrulers/status
- servicemonitors
- servicemonitors/status
- podmonitors
- probes
- prometheusrules
Expand Down
1 change: 1 addition & 0 deletions assets/prometheus-operator/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ rules:
- thanosrulers/finalizers
- thanosrulers/status
- servicemonitors
- servicemonitors/status
- podmonitors
- probes
- prometheusrules
Expand Down
2 changes: 1 addition & 1 deletion jsonnet/jsonnetfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "release-0.83"
"version": "release-0.84"
},
{
"source": {
Expand Down
6 changes: 3 additions & 3 deletions jsonnet/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "6176050674d427a1cee23d17b6b0bf307d806e57",
"version": "5b60eb7f1037736eb540ceded294ea005c4b97ec",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -202,8 +202,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "5cf2f5d37906d64b2259a262e319df4c74639e31",
"sum": "xzGiEUwaDtS7FdoiizjlOFbvhz7d8vrbKUAJML1ssXw="
"version": "8337f851ab7550fb7f914461e810a722e4312e17",
"sum": "ikNhDwJwp2YNd5JPZWL6nkgZ3pzQIYfk3uxO3yQQqg4="
},
{
"source": {
Expand Down
2 changes: 1 addition & 1 deletion ...00_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
operator.prometheus.io/version: 0.83.0
operator.prometheus.io/version: 0.84.0
service.beta.openshift.io/inject-cabundle: "true"
labels:
app.kubernetes.io/managed-by: cluster-version-operator
Expand Down
177 changes: 169 additions & 8 deletions ...ests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
operator.prometheus.io/version: 0.83.0
operator.prometheus.io/version: 0.84.0
labels:
app.kubernetes.io/managed-by: cluster-version-operator
app.kubernetes.io/part-of: openshift-monitoring
Expand Down Expand Up @@ -998,6 +998,7 @@ spec:
The default value is `OnNamespace`.
enum:
- OnNamespace
- OnNamespaceExceptForAlertmanagerNamespace
- None
type: string
type: object
Expand Down Expand Up @@ -1726,6 +1727,17 @@ spec:
type: string
type: object
type: object
jira:
description: The default configuration for Jira.
properties:
apiURL:
description: |-
The default Jira API URL.

It requires Alertmanager >= v0.28.0.
pattern: ^(http|https)://.+$
type: string
type: object
opsGenieApiKey:
description: The default OpsGenie API Key.
properties:
Expand Down Expand Up @@ -1780,6 +1792,67 @@ spec:
This has no impact on alerts from Prometheus, as they always include EndsAt.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
rocketChat:
description: The default configuration for Rocket Chat.
properties:
apiURL:
description: |-
The default Rocket Chat API URL.

It requires Alertmanager >= v0.28.0.
pattern: ^(http|https)://.+$
type: string
token:
description: |-
The default Rocket Chat token.

It requires Alertmanager >= v0.28.0.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
tokenID:
description: |-
The default Rocket Chat Token ID.

It requires Alertmanager >= v0.28.0.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
slackApiUrl:
description: The default Slack API URL.
properties:
Expand Down Expand Up @@ -2032,6 +2105,94 @@ spec:
type: string
type: object
type: object
telegram:
description: The default Telegram config
properties:
apiURL:
description: |-
The default Telegram API URL.

It requires Alertmanager >= v0.24.0.
pattern: ^(http|https)://.+$
type: string
type: object
victorops:
description: The default configuration for VictorOps.
properties:
apiKey:
description: The default VictorOps API Key.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
apiURL:
description: The default VictorOps API URL.
pattern: ^(http|https)://.+$
type: string
type: object
webex:
description: The default configuration for Jira.
properties:
apiURL:
description: |-
The default Webex API URL.

It requires Alertmanager >= v0.25.0.
pattern: ^(http|https)://.+$
type: string
type: object
wechat:
description: The default WeChat Config
properties:
apiCorpID:
description: The default WeChat API Corporate ID.
minLength: 1
type: string
apiSecret:
description: The default WeChat API Secret.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
apiURL:
description: |-
The default WeChat API URL.
The default value is "https://qyapi.weixin.qq.com/cgi-bin/"
pattern: ^(http|https)://.+$
type: string
type: object
type: object
name:
description: |-
Expand Down Expand Up @@ -4010,7 +4171,7 @@ spec:
description: |-
An optional list of references to secrets in the same namespace
to use for pulling prometheus and alertmanager images from registries
see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod
see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
items:
description: |-
LocalObjectReference contains enough information to let you locate the
Expand Down Expand Up @@ -5509,7 +5670,7 @@ spec:
Annotations is an unstructured key value map stored with a resource that may be
set by external tools to store and retrieve arbitrary metadata. They are not
queryable and should be preserved when modifying objects.
More info: http://kubernetes.io/docs/user-guide/annotations
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
type: object
labels:
additionalProperties:
Expand All @@ -5518,7 +5679,7 @@ spec:
Map of string keys and values that can be used to organize and categorize
(scope and select) objects. May match selectors of replication controllers
and services.
More info: http://kubernetes.io/docs/user-guide/labels
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
type: object
name:
description: |-
Expand All @@ -5527,7 +5688,7 @@ spec:
automatically. Name is primarily intended for creation idempotence and configuration
definition.
Cannot be updated.
More info: http://kubernetes.io/docs/user-guide/identifiers#names
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
type: string
type: object
portName:
Expand Down Expand Up @@ -6182,7 +6343,7 @@ spec:
Annotations is an unstructured key value map stored with a resource that may be
set by external tools to store and retrieve arbitrary metadata. They are not
queryable and should be preserved when modifying objects.
More info: http://kubernetes.io/docs/user-guide/annotations
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
type: object
labels:
additionalProperties:
Expand All @@ -6191,7 +6352,7 @@ spec:
Map of string keys and values that can be used to organize and categorize
(scope and select) objects. May match selectors of replication controllers
and services.
More info: http://kubernetes.io/docs/user-guide/labels
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
type: object
name:
description: |-
Expand All @@ -6200,7 +6361,7 @@ spec:
automatically. Name is primarily intended for creation idempotence and configuration
definition.
Cannot be updated.
More info: http://kubernetes.io/docs/user-guide/identifiers#names
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
type: string
type: object
spec:
Expand Down
53 changes: 49 additions & 4 deletions manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
operator.prometheus.io/version: 0.83.0
operator.prometheus.io/version: 0.84.0
labels:
app.kubernetes.io/managed-by: cluster-version-operator
app.kubernetes.io/part-of: openshift-monitoring
Expand Down Expand Up @@ -423,6 +423,14 @@ spec:
type: string
type: object
type: array
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
that should be excluded from proxying. IP and domain names can
contain port numbers.

It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
type: string
oauth2:
description: |-
`oauth2` configures the OAuth2 settings to use when scraping the target.
Expand Down Expand Up @@ -753,10 +761,47 @@ spec:
maximum: 65535
minimum: 1
type: integer
proxyUrl:
proxyConnectHeader:
additionalProperties:
items:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.

It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
type: object
x-kubernetes-map-type: atomic
proxyFromEnvironment:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).

It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^(http|https|socks5)://.+$
type: string
relabelings:
description: |-
Expand Down
Loading