diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 64cb4e4f6123f74c9a1d7df3a351c988b95f7355..a46d12b1472caa0d369c23e3e9ba3a73d1eb8b92 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -6,7 +6,7 @@
"nodeExporter": "1.8.2",
"prometheus": "2.54.1",
"prometheusAdapter": "0.12.0",
- "prometheusOperator": "0.76.2",
+ "prometheusOperator": "0.77.0",
"kubeRbacProxy": "0.18.1",
"configmapReload": "0.13.1",
"pyrra": "0.6.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index a43073dfd1fb2aee870290428dcb0ba061a84f8d..567aabebd8c9a0dc314dae80269f50b0513d1a82 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "6c1fe4a92a00854fc54828e257708f9e7f5b4f28",
+ "version": "bd93a0060ab4d177e28e03c8765cb904adc0fae2",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -88,7 +88,7 @@
"subdir": "grafana-builder"
}
},
- "version": "c0b39ad68a99c7791a19b14da92c7f886d8c55da",
+ "version": "4ad199dab450b829274234b1014ca577649b4557",
"sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
},
{
@@ -98,7 +98,7 @@
"subdir": "mixin-utils"
}
},
- "version": "c0b39ad68a99c7791a19b14da92c7f886d8c55da",
+ "version": "4ad199dab450b829274234b1014ca577649b4557",
"sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
},
{
@@ -128,8 +128,8 @@
"subdir": ""
}
},
- "version": "50150c585ebee6e4d9cb72218182da8f3c616515",
- "sum": "0g1pn3gGq2yZyeUTx+zniK/D7jMKbAnqJ83Lke+uJ6o="
+ "version": "3cb7958a56688386e8f6cb0f1258bdb1234797d6",
+ "sum": "f+GOrDpxTRmyYkaZKy6CCwqGoCs9MMCmEGT1cTJ0m6k="
},
{
"source": {
@@ -158,7 +158,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "1f36a6778f8e4b08799c43f3e2f9ba624feac416",
+ "version": "23cbc111619cbe089a04ae81463584e88a183af9",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -169,8 +169,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "1f36a6778f8e4b08799c43f3e2f9ba624feac416",
- "sum": "IYa+0bUT25fTKjjDyZw9gV8DAi1BgfmLE1ucouoxKCs="
+ "version": "23cbc111619cbe089a04ae81463584e88a183af9",
+ "sum": "/bnXn93GATeKKUfv5o3BoURZ/f/uOx6IqPqiUjSM4Z4="
},
{
"source": {
@@ -179,7 +179,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "e9904f93a7efa063bac628ed0b74184acf1c7401",
+ "version": "e1492602209b86e0ca6d7671c7353b62a31b897b",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -190,7 +190,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "7a97429e57d8aba827755a5cc4b5a84cec775d2c",
+ "version": "a37174eccfa67882184acc7f44e338aa5f5163b8",
"sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
},
{
@@ -200,7 +200,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "62bd893b803393388dbfeb08e3cc8904b97f54b9",
+ "version": "919648cafc2c07ed5c1d5dd657b8080bee331aaf",
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
"name": "prometheus"
},
@@ -222,7 +222,7 @@
"subdir": "mixin"
}
},
- "version": "883fade9bd75fe595b6e947a33c59e27fca1abda",
+ "version": "a2113fd81cba3926f5f9fcf807e24920e6e81fe3",
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index d606d4d6f5f77b8aaf0f15008685a9f1e48734ac..71c17f7b45e26ef42d834057d89f491540e1b110 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -10424,7 +10424,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"requests.cpu\"})",
+ "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"requests.cpu|cpu\"})",
"legendFormat": "quota - requests"
},
{
@@ -10432,7 +10432,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"limits.cpu\"})",
+ "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"limits.cpu\"})",
"legendFormat": "quota - limits"
}
],
@@ -10719,7 +10719,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"requests.memory\"})",
+ "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"requests.memory|memory\"})",
"legendFormat": "quota - requests"
},
{
@@ -10727,7 +10727,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"limits.memory\"})",
+ "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"limits.memory\"})",
"legendFormat": "quota - limits"
}
],
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index cdf106ef38a7a27d46ab0523fdcd3a7bc3008151..03640c2f2908e88af8c4183e251a212123883ded 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -487,9 +487,9 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeapierrorbudgetburn
summary: The API server is burning too much error budget.
expr: |
- sum(apiserver_request:burnrate1h) > (14.40 * 0.01000)
- and
- sum(apiserver_request:burnrate5m) > (14.40 * 0.01000)
+ sum by(cluster) (apiserver_request:burnrate1h) > (14.40 * 0.01000)
+ and on(cluster)
+ sum by(cluster) (apiserver_request:burnrate5m) > (14.40 * 0.01000)
for: 2m
labels:
long: 1h
@@ -501,9 +501,9 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeapierrorbudgetburn
summary: The API server is burning too much error budget.
expr: |
- sum(apiserver_request:burnrate6h) > (6.00 * 0.01000)
- and
- sum(apiserver_request:burnrate30m) > (6.00 * 0.01000)
+ sum by(cluster) (apiserver_request:burnrate6h) > (6.00 * 0.01000)
+ and on(cluster)
+ sum by(cluster) (apiserver_request:burnrate30m) > (6.00 * 0.01000)
for: 15m
labels:
long: 6h
@@ -515,9 +515,9 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeapierrorbudgetburn
summary: The API server is burning too much error budget.
expr: |
- sum(apiserver_request:burnrate1d) > (3.00 * 0.01000)
- and
- sum(apiserver_request:burnrate2h) > (3.00 * 0.01000)
+ sum by(cluster) (apiserver_request:burnrate1d) > (3.00 * 0.01000)
+ and on(cluster)
+ sum by(cluster) (apiserver_request:burnrate2h) > (3.00 * 0.01000)
for: 1h
labels:
long: 1d
@@ -529,9 +529,9 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeapierrorbudgetburn
summary: The API server is burning too much error budget.
expr: |
- sum(apiserver_request:burnrate3d) > (1.00 * 0.01000)
- and
- sum(apiserver_request:burnrate6h) > (1.00 * 0.01000)
+ sum by(cluster) (apiserver_request:burnrate3d) > (1.00 * 0.01000)
+ and on(cluster)
+ sum by(cluster) (apiserver_request:burnrate6h) > (1.00 * 0.01000)
for: 3h
labels:
long: 3d
@@ -545,7 +545,7 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeclientcertificateexpiration
summary: Client certificate is about to expire.
expr: |
- apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 604800
+ apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and on(cluster, job) histogram_quantile(0.01, sum by (cluster, job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 604800
for: 5m
labels:
severity: warning
@@ -555,7 +555,7 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeclientcertificateexpiration
summary: Client certificate is about to expire.
expr: |
- apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400
+ apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and on(cluster, job) histogram_quantile(0.01, sum by (cluster, job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400
for: 5m
labels:
severity: critical
@@ -594,7 +594,7 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeapiterminatedrequests
summary: The kubernetes apiserver has terminated {{ $value | humanizePercentage }} of its incoming requests.
expr: |
- sum(rate(apiserver_request_terminations_total{job="apiserver"}[10m])) / ( sum(rate(apiserver_request_total{job="apiserver"}[10m])) + sum(rate(apiserver_request_terminations_total{job="apiserver"}[10m])) ) > 0.20
+ sum by(cluster) (rate(apiserver_request_terminations_total{job="apiserver"}[10m])) / ( sum by(cluster) (rate(apiserver_request_total{job="apiserver"}[10m])) + sum by(cluster) (rate(apiserver_request_terminations_total{job="apiserver"}[10m])) ) > 0.20
for: 5m
labels:
severity: warning
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index c47b1c787a8f6223e5a132198bf67b46ae16ad27..cf725cd6eee6950a5df49d05c14d8592cc55bf24 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
rules:
- apiGroups:
@@ -56,7 +56,6 @@ rules:
resources:
- services
- services/finalizers
- - endpoints
verbs:
- get
- create
@@ -98,6 +97,15 @@ rules:
- storageclasses
verbs:
- get
+- apiGroups:
+ - ""
+ resources:
+ - endpoints
+ verbs:
+ - get
+ - create
+ - update
+ - delete
- apiGroups:
- authentication.k8s.io
resources:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index 45df8d2ad323c3099ec95b789f0811dc5ebcaa47..2f9d10af2f794e9d4b567290680d68b4dc5ce739 100644
--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index edda81d0771902770597e49fb00b1a7ce0014fee..92fde519f27ef12eeaf5a741880b78a593537490 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,17 +23,19 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.76.2
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.77.0
+ - --kubelet-endpoints=true
+ - --kubelet-endpointslice=false
env:
- name: GOGC
value: "30"
- image: quay.io/prometheus-operator/prometheus-operator:v0.76.2
+ image: quay.io/prometheus-operator/prometheus-operator:v0.77.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index bd940e5cb0b4a5b1ce7445954678032b0dea0cdd..8230913a144522259c0aacf22193329cc4cc43d3 100644
--- a/manifests/prometheusOperator-networkPolicy.yaml
+++ b/manifests/prometheusOperator-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index b1c6cd4a8526fa9580325a6efea75fadbfbc7ed8..8ff481612b16b9cf33d0be5245d977399d8a823e 100644
--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index 0e98932be170ed71a1cc547545122a019bf54aa7..9f3172ed9a123260661fd8609935e44acb9c41c3 100644
--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 4b806e0458311531049ab19ff6267e145fdfe965..8b44ff16ec2eb26e706df5ba079f3ca3c92fd49f 100644
--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index 0a4978de89d9437b332813e06c838e9f5244bfed..fb45d37f5487be16d9bc5dc2d66f3c27ef00face 100644
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.76.2
+ app.kubernetes.io/version: 0.77.0
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index f107197bb8cc7036a06d6eb860f17f7df637ab9a..578beb4d078e7402e26b6e77bce56c1ce7ed2f4b 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 4b3ac0f77601270fbb8716475b2166a215529c7e..6d49b6e7d3c58ee1e9e558af7325655f3083e027 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -7910,6 +7910,11 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: object
+ certFile:
+ description: |-
+ Path to the TLS certificate file in the Prometheus container for the server.
+ Mutually exclusive with `cert`.
+ type: string
cipherSuites:
description: |-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
@@ -7972,6 +7977,11 @@ spec:
For more detail on clientAuth options:
https://golang.org/pkg/crypto/tls/#ClientAuthType
type: string
+ clientCAFile:
+ description: |-
+ Path to the CA certificate file for client certificate authentication to the server.
+ Mutually exclusive with `client_ca`.
+ type: string
curvePreferences:
description: |-
Elliptic curves that will be used in an ECDHE handshake, in preference
@@ -7980,6 +7990,11 @@ spec:
items:
type: string
type: array
+ keyFile:
+ description: |-
+ Path to the TLS key file in the Prometheus container for the server.
+ Mutually exclusive with `keySecret`.
+ type: string
keySecret:
description: Secret containing the TLS key for the server.
properties:
@@ -8015,9 +8030,6 @@ spec:
cipher suite. If true then the server's preference, as expressed in
the order of elements in cipherSuites, is used.
type: boolean
- required:
- - cert
- - keySecret
type: object
type: object
type: object
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index e5eac4b8189a570d84e98208ada2aa7b9d0813a8..b05672ab4ef4d71ba337104734e12a92e9ff1be2 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 1ee90544e6e3c76a8d28cc0703f33ca30c66722f..9a7b793661741f775cbe3127711196545f379ab5 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index b4b3836a194156545d195605f576b8cd0681f75d..f1c6024f6723ce646e3a3cc653504a7edd39cc2c 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -11757,6 +11757,11 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: object
+ certFile:
+ description: |-
+ Path to the TLS certificate file in the Prometheus container for the server.
+ Mutually exclusive with `cert`.
+ type: string
cipherSuites:
description: |-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
@@ -11819,6 +11824,11 @@ spec:
For more detail on clientAuth options:
https://golang.org/pkg/crypto/tls/#ClientAuthType
type: string
+ clientCAFile:
+ description: |-
+ Path to the CA certificate file for client certificate authentication to the server.
+ Mutually exclusive with `client_ca`.
+ type: string
curvePreferences:
description: |-
Elliptic curves that will be used in an ECDHE handshake, in preference
@@ -11827,6 +11837,11 @@ spec:
items:
type: string
type: array
+ keyFile:
+ description: |-
+ Path to the TLS key file in the Prometheus container for the server.
+ Mutually exclusive with `keySecret`.
+ type: string
keySecret:
description: Secret containing the TLS key for the server.
properties:
@@ -11862,9 +11877,6 @@ spec:
cipher suite. If true then the server's preference, as expressed in
the order of elements in cipherSuites, is used.
type: boolean
- required:
- - cert
- - keySecret
type: object
type: object
type: object
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index c5dff6ec465edca5cc2c529cac9e1eedb76a3bc6..a988db911b06a9b05dfef919bc59592643929236 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -9723,6 +9723,11 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: object
+ certFile:
+ description: |-
+ Path to the TLS certificate file in the Prometheus container for the server.
+ Mutually exclusive with `cert`.
+ type: string
cipherSuites:
description: |-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
@@ -9785,6 +9790,11 @@ spec:
For more detail on clientAuth options:
https://golang.org/pkg/crypto/tls/#ClientAuthType
type: string
+ clientCAFile:
+ description: |-
+ Path to the CA certificate file for client certificate authentication to the server.
+ Mutually exclusive with `client_ca`.
+ type: string
curvePreferences:
description: |-
Elliptic curves that will be used in an ECDHE handshake, in preference
@@ -9793,6 +9803,11 @@ spec:
items:
type: string
type: array
+ keyFile:
+ description: |-
+ Path to the TLS key file in the Prometheus container for the server.
+ Mutually exclusive with `keySecret`.
+ type: string
keySecret:
description: Secret containing the TLS key for the server.
properties:
@@ -9828,9 +9843,6 @@ spec:
cipher suite. If true then the server's preference, as expressed in
the order of elements in cipherSuites, is used.
type: boolean
- required:
- - cert
- - keySecret
type: object
type: object
type: object
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 6d25da288c3966ec782ffa8b5174e6011f5b89ea..8e359829050120733ac507831f3ddd96379d668e 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 131395b607daa8cea93d5ce705687eef3de82fb6..756bf0b09e6d2d098c5c616375cb939bb537f7aa 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index da1aeeb4a82bc87b65c6d30ceb2af6e311925338..e46f407cac3690c6af2c7ea7432293d318e4a92d 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index fa165bce26c9de6e901d4002d3123535ee324525..0fb45bc636fcb7ffa8236914d4be421e84126a20 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.1
- operator.prometheus.io/version: 0.76.2
+ controller-gen.kubebuilder.io/version: v0.16.3
+ operator.prometheus.io/version: 0.77.0
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -7355,6 +7355,11 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: object
+ certFile:
+ description: |-
+ Path to the TLS certificate file in the Prometheus container for the server.
+ Mutually exclusive with `cert`.
+ type: string
cipherSuites:
description: |-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
@@ -7417,6 +7422,11 @@ spec:
For more detail on clientAuth options:
https://golang.org/pkg/crypto/tls/#ClientAuthType
type: string
+ clientCAFile:
+ description: |-
+ Path to the CA certificate file for client certificate authentication to the server.
+ Mutually exclusive with `client_ca`.
+ type: string
curvePreferences:
description: |-
Elliptic curves that will be used in an ECDHE handshake, in preference
@@ -7425,6 +7435,11 @@ spec:
items:
type: string
type: array
+ keyFile:
+ description: |-
+ Path to the TLS key file in the Prometheus container for the server.
+ Mutually exclusive with `keySecret`.
+ type: string
keySecret:
description: Secret containing the TLS key for the server.
properties:
@@ -7460,9 +7475,6 @@ spec:
cipher suite. If true then the server's preference, as expressed in
the order of elements in cipherSuites, is used.
type: boolean
- required:
- - cert
- - keySecret
type: object
type: object
type: object