Skip to content

Commit b57c6d3

Browse files
slashpaislashpai
committed
NO-JIRA: Bump prometheus-operator to v0.80.0
Signed-off-by: Jayapriya Pai <[email protected]>
1 parent 08e9f1a commit b57c6d3

10 files changed

+209
-79
lines changed

‎jsonnet/jsonnetfile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"subdir": "jsonnet/prometheus-operator"
1818
}
1919
},
20-
"version": "release-0.79"
20+
"version": "release-0.80"
2121
},
2222
{
2323
"source": {

‎jsonnet/jsonnetfile.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"subdir": "jsonnet/mixin"
192192
}
193193
},
194-
"version": "f867bad2413797bff71b59744500bbd710f64ea1",
194+
"version": "56cc9eea5f8bffedbc4a77ae08555dd5f510ed76",
195195
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
196196
"name": "prometheus-operator-mixin"
197197
},
@@ -202,8 +202,8 @@
202202
"subdir": "jsonnet/prometheus-operator"
203203
}
204204
},
205-
"version": "1d2dca5a93d50fe09d7662860f80448d2e37ff1a",
206-
"sum": "gOCVfxMEvdSyPdh7c3UJPZoxHOUUTT6z5G2sZ8PACCM="
205+
"version": "56cc9eea5f8bffedbc4a77ae08555dd5f510ed76",
206+
"sum": "SzECES1Sqax8WtD7faDXWEjFii0LLkcSkGqE5B3vlvQ="
207207
},
208208
{
209209
"source": {

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.1
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.79.2
10+
operator.prometheus.io/version: 0.80.0
1111
service.beta.openshift.io/inject-cabundle: "true"
1212
labels:
1313
app.kubernetes.io/managed-by: cluster-version-operator

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml‎

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.1
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.79.2
10+
operator.prometheus.io/version: 0.80.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -8003,7 +8003,12 @@ spec:
80038003
description: Defines the TLS parameters for HTTPS.
80048004
properties:
80058005
cert:
8006-
description: Contains the TLS certificate for the server.
8006+
description: |-
8007+
Secret or ConfigMap containing the TLS certificate for the web server.
8008+
8009+
Either `keySecret` or `keyFile` must be defined.
8010+
8011+
It is mutually exclusive with `certFile`.
80078012
properties:
80088013
configMap:
80098014
description: ConfigMap containing data to use for the targets.
@@ -8052,19 +8057,28 @@ spec:
80528057
type: object
80538058
certFile:
80548059
description: |-
8055-
Path to the TLS certificate file in the Prometheus container for the server.
8056-
Mutually exclusive with `cert`.
8060+
Path to the TLS certificate file in the container for the web server.
8061+
8062+
Either `keySecret` or `keyFile` must be defined.
8063+
8064+
It is mutually exclusive with `cert`.
80578065
type: string
80588066
cipherSuites:
80598067
description: |-
8060-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
8061-
Go default cipher suites are used. Available cipher suites are documented
8062-
in the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants
8068+
List of supported cipher suites for TLS versions up to TLS 1.2.
8069+
8070+
If not defined, the Go default cipher suites are used.
8071+
Available cipher suites are documented in the Go documentation:
8072+
https://golang.org/pkg/crypto/tls/#pkg-constants
80638073
items:
80648074
type: string
80658075
type: array
80668076
client_ca:
8067-
description: Contains the CA certificate for client certificate authentication to the server.
8077+
description: |-
8078+
Secret or ConfigMap containing the CA certificate for client certificate
8079+
authentication to the server.
8080+
8081+
It is mutually exclusive with `clientCAFile`.
80688082
properties:
80698083
configMap:
80708084
description: ConfigMap containing data to use for the targets.
@@ -8113,30 +8127,43 @@ spec:
81138127
type: object
81148128
clientAuthType:
81158129
description: |-
8116-
Server policy for client authentication. Maps to ClientAuth Policies.
8130+
The server policy for client TLS authentication.
8131+
81178132
For more detail on clientAuth options:
81188133
https://golang.org/pkg/crypto/tls/#ClientAuthType
81198134
type: string
81208135
clientCAFile:
81218136
description: |-
8122-
Path to the CA certificate file for client certificate authentication to the server.
8123-
Mutually exclusive with `client_ca`.
8137+
Path to the CA certificate file for client certificate authentication to
8138+
the server.
8139+
8140+
It is mutually exclusive with `client_ca`.
81248141
type: string
81258142
curvePreferences:
81268143
description: |-
81278144
Elliptic curves that will be used in an ECDHE handshake, in preference
8128-
order. Available curves are documented in the go documentation:
8145+
order.
8146+
8147+
Available curves are documented in the Go documentation:
81298148
https://golang.org/pkg/crypto/tls/#CurveID
81308149
items:
81318150
type: string
81328151
type: array
81338152
keyFile:
81348153
description: |-
8135-
Path to the TLS key file in the Prometheus container for the server.
8136-
Mutually exclusive with `keySecret`.
8154+
Path to the TLS private key file in the container for the web server.
8155+
8156+
If defined, either `cert` or `certFile` must be defined.
8157+
8158+
It is mutually exclusive with `keySecret`.
81378159
type: string
81388160
keySecret:
8139-
description: Secret containing the TLS key for the server.
8161+
description: |-
8162+
Secret containing the TLS private key for the web server.
8163+
8164+
Either `cert` or `certFile` must be defined.
8165+
8166+
It is mutually exclusive with `keyFile`.
81408167
properties:
81418168
key:
81428169
description: The key of the secret to select from. Must be a valid secret key.
@@ -8158,16 +8185,17 @@ spec:
81588185
type: object
81598186
x-kubernetes-map-type: atomic
81608187
maxVersion:
8161-
description: Maximum TLS version that is acceptable. Defaults to TLS13.
8188+
description: Maximum TLS version that is acceptable.
81628189
type: string
81638190
minVersion:
8164-
description: Minimum TLS version that is acceptable. Defaults to TLS12.
8191+
description: Minimum TLS version that is acceptable.
81658192
type: string
81668193
preferServerCipherSuites:
81678194
description: |-
8168-
Controls whether the server selects the
8169-
client's most preferred cipher suite, or the server's most preferred
8170-
cipher suite. If true then the server's preference, as expressed in
8195+
Controls whether the server selects the client's most preferred cipher
8196+
suite, or the server's most preferred cipher suite.
8197+
8198+
If true then the server's preference, as expressed in
81718199
the order of elements in cipherSuites, is used.
81728200
type: boolean
81738201
type: object

‎manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.1
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.79.2
10+
operator.prometheus.io/version: 0.80.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -864,6 +864,7 @@ spec:
864864
865865
If empty, Prometheus uses the global scrape timeout unless it is less
866866
than the target's scrape interval value in which the latter is used.
867+
The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
867868
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
868869
type: string
869870
targetPort:

‎manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.1
66
include.release.openshift.io/hypershift: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.79.2
10+
operator.prometheus.io/version: 0.80.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -697,6 +697,7 @@ spec:
697697
description: |-
698698
Timeout for scraping metrics from the Prometheus exporter.
699699
If not specified, the Prometheus global scrape timeout is used.
700+
The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
700701
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
701702
type: string
702703
targetLimit:

0 commit comments

Comments
 (0)