fix(deps): update helm release k8s-monitoring to v1.6.16 #916
+5
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![renovate[bot]](https://avatars.githubusercontent.com/in/2740?s=60&v=4){kind=small}
Changes Default Valuesdiff -U 4 -r out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out
--- out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out 2024-12-17 15:37:14.588829475 +0000
+++ out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out 2024-12-17 15:36:46.912869396 +0000
@@ -643,8 +643,16 @@
# @default -- 60s
# @section -- Metrics Job: Auto-Discovery
scrapeInterval: ""
+ # -- The list of namespaces to include in autodiscovery. If empty, all namespaces are included.
+ # @section -- Metrics Job: Auto-Discovery
+ namespaces: []
+
+ # -- The list of namespaces to exclude from autodiscovery.
+ # @section -- Metrics Job: Auto-Discovery
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for auto-discovered entities.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1464,8 +1472,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
extraRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ excludeMetrics: []
+
# -- Rule blocks to be added to the prometheus.relabel component for PodMonitor objects.
# These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no `__meta*` labels are present.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
@@ -1512,8 +1529,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (Probes)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1554,8 +1580,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1706,8 +1741,14 @@
# Format: `<structured metadata>: <Loki label>`.
# @section -- Logs Scrape: Pod Logs
structuredMetadata: {}
+ # Settings specific for gathering Pod logs using the "volumes" gather method.
+ volumeGatherSettings:
+ # -- Only gather new log lines since this was deployed. Do not gather historical log lines.
+ # @section -- Logs Scrape: Pod Logs
+ onlyGatherNewLogLines: false
+
# PodLog Objects
podLogsObjects:
# -- Enable discovery of Grafana Alloy PodLogs objects.
# @section -- Logs Scrape: PodLog Objects
@@ -1878,8 +1919,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (eBPF)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (eBPF)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1898,8 +1943,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (java)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (java)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for Java profile sources.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Profiles (java)
extraRelabelingRules: ""
@@ -1921,8 +1970,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (pprof)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (pprof)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block)) |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:37:13.435830566 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:36:45.761871452 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.15", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:37:13.442830560 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:36:45.769871438 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:37:13.442830560 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:36:45.769871438 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.15"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:37:12.942831033 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:36:45.267872335 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -951,5 +936,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.15", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:37:12.949831026 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:36:45.275872320 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1172,10 +1157,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:37:12.949831026 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:36:45.275872320 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.15"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:37:14.426829629 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:36:46.746869692 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.15", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:37:14.433829622 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:36:46.753869680 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:37:14.433829622 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:36:46.753869680 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.15"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:37:13.926830101 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-17 15:36:46.256870568 +0000
@@ -812,18 +812,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -833,18 +823,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -854,18 +834,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1016,5 +986,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.15", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:37:13.933830095 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-17 15:36:46.263870555 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -821,18 +821,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -842,18 +832,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -863,18 +843,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1237,10 +1207,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:37:13.933830095 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-17 15:36:46.263870555 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.15"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.15"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.15
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test |
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/k8s-monitoring-1.x
branch
from
267ef69 to
4c259b7
Compare
Changes Default Valuesdiff -U 4 -r out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out
--- out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out 2024-12-20 01:35:46.972964505 +0000
+++ out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out 2024-12-20 01:35:18.222615048 +0000
@@ -643,8 +643,16 @@
# @default -- 60s
# @section -- Metrics Job: Auto-Discovery
scrapeInterval: ""
+ # -- The list of namespaces to include in autodiscovery. If empty, all namespaces are included.
+ # @section -- Metrics Job: Auto-Discovery
+ namespaces: []
+
+ # -- The list of namespaces to exclude from autodiscovery.
+ # @section -- Metrics Job: Auto-Discovery
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for auto-discovered entities.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1464,8 +1472,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
extraRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ excludeMetrics: []
+
# -- Rule blocks to be added to the prometheus.relabel component for PodMonitor objects.
# These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no `__meta*` labels are present.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
@@ -1512,8 +1529,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (Probes)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1554,8 +1580,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1706,8 +1741,14 @@
# Format: `<structured metadata>: <Loki label>`.
# @section -- Logs Scrape: Pod Logs
structuredMetadata: {}
+ # Settings specific for gathering Pod logs using the "volumes" gather method.
+ volumeGatherSettings:
+ # -- Only gather new log lines since this was deployed. Do not gather historical log lines.
+ # @section -- Logs Scrape: Pod Logs
+ onlyGatherNewLogLines: false
+
# PodLog Objects
podLogsObjects:
# -- Enable discovery of Grafana Alloy PodLogs objects.
# @section -- Logs Scrape: PodLog Objects
@@ -1878,8 +1919,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (eBPF)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (eBPF)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1898,8 +1943,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (java)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (java)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for Java profile sources.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Profiles (java)
extraRelabelingRules: ""
@@ -1921,8 +1970,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (pprof)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (pprof)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block)) |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:45.819954621 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:17.070604283 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:45.814954586 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:17.065604236 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:46.306958097 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:17.563608890 +0000
@@ -812,18 +812,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -833,18 +823,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -854,18 +834,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1016,5 +986,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:46.314958154 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -821,18 +821,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -842,18 +832,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -863,18 +843,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1237,10 +1207,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:46.314958154 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:45.820954629 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:17.071604292 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:45.814954586 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:17.065604236 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:45.821954636 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:17.072604301 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:45.821954636 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:17.072604301 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:45.320951060 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:16.568599591 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:45.326951103 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:16.575599657 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:45.320951060 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:16.569599601 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -951,5 +936,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:45.327951110 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:16.576599666 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1172,10 +1157,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:45.327951110 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:16.576599666 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:18.063613563 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:46.808962591 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:18.057613506 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:46.815962672 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:46.809962602 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-20 01:35:18.057613506 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:46.816962684 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:46.816962684 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-20 01:35:18.064613572 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-20 01:35:17.568608937 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:46.312958140 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-20 01:35:17.568608937 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:46.306958097 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-20 01:35:17.563608890 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:46.313958147 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-20 01:35:17.569608946 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
doesn’t work anymore. Maybe we should use excludeNamespace instead |
renovate
bot
force-pushed
the
renovate/k8s-monitoring-1.x
branch
from
4c259b7 to
57092ce
Compare
Changes Default Valuesdiff -U 4 -r out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out
--- out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out 2024-12-29 23:11:41.145924324 +0000
+++ out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out 2024-12-29 23:11:14.584722391 +0000
@@ -643,8 +643,16 @@
# @default -- 60s
# @section -- Metrics Job: Auto-Discovery
scrapeInterval: ""
+ # -- The list of namespaces to include in autodiscovery. If empty, all namespaces are included.
+ # @section -- Metrics Job: Auto-Discovery
+ namespaces: []
+
+ # -- The list of namespaces to exclude from autodiscovery.
+ # @section -- Metrics Job: Auto-Discovery
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for auto-discovered entities.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1464,8 +1472,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
extraRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ excludeMetrics: []
+
# -- Rule blocks to be added to the prometheus.relabel component for PodMonitor objects.
# These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no `__meta*` labels are present.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
@@ -1512,8 +1529,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (Probes)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1554,8 +1580,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1706,8 +1741,14 @@
# Format: `<structured metadata>: <Loki label>`.
# @section -- Logs Scrape: Pod Logs
structuredMetadata: {}
+ # Settings specific for gathering Pod logs using the "volumes" gather method.
+ volumeGatherSettings:
+ # -- Only gather new log lines since this was deployed. Do not gather historical log lines.
+ # @section -- Logs Scrape: Pod Logs
+ onlyGatherNewLogLines: false
+
# PodLog Objects
podLogsObjects:
# -- Enable discovery of Grafana Alloy PodLogs objects.
# @section -- Logs Scrape: PodLog Objects
@@ -1878,8 +1919,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (eBPF)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (eBPF)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1898,8 +1943,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (java)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (java)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for Java profile sources.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Profiles (java)
extraRelabelingRules: ""
@@ -1921,8 +1970,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (pprof)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (pprof)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block)) |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:40.004915732 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:40.004915732 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:13.367713214 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:39.998915686 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:13.361713169 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:40.491919399 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:13.856716847 +0000
@@ -812,18 +812,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -833,18 +823,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -854,18 +834,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1016,5 +986,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:40.499919459 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:13.864716906 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -821,18 +821,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -842,18 +832,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -863,18 +843,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1237,10 +1207,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:40.499919459 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:13.864716906 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:39.998915686 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:13.362713177 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:13.368713221 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:40.005915739 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:13.369713229 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:39.483911808 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:39.483911808 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:39.478911771 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:12.867709499 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:12.873709544 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:39.478911771 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:12.867709499 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -951,5 +936,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:12.874709551 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1172,10 +1157,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:39.484911816 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:12.874709551 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:40.984923111 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:14.418721120 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2024-12-29 23:11:14.425721173 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:40.990923156 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2024-12-29 23:11:14.426721181 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:40.991923164 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2024-12-29 23:11:14.426721181 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:40.985923119 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2024-12-29 23:11:14.419721127 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:40.991923164 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2024-12-29 23:11:14.426721181 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:40.991923164 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2024-12-29 23:11:14.426721181 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:40.491919399 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2024-12-29 23:11:13.856716847 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:40.498919451 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2024-12-29 23:11:13.863716899 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Default Valuesdiff -U 4 -r out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out
--- out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out 2025-01-01 00:13:15.237749458 +0000
+++ out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out 2025-01-01 00:12:41.597555079 +0000
@@ -643,8 +643,16 @@
# @default -- 60s
# @section -- Metrics Job: Auto-Discovery
scrapeInterval: ""
+ # -- The list of namespaces to include in autodiscovery. If empty, all namespaces are included.
+ # @section -- Metrics Job: Auto-Discovery
+ namespaces: []
+
+ # -- The list of namespaces to exclude from autodiscovery.
+ # @section -- Metrics Job: Auto-Discovery
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for auto-discovered entities.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1464,8 +1472,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
extraRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ excludeMetrics: []
+
# -- Rule blocks to be added to the prometheus.relabel component for PodMonitor objects.
# These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no `__meta*` labels are present.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
@@ -1512,8 +1529,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (Probes)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1554,8 +1580,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1706,8 +1741,14 @@
# Format: `<structured metadata>: <Loki label>`.
# @section -- Logs Scrape: Pod Logs
structuredMetadata: {}
+ # Settings specific for gathering Pod logs using the "volumes" gather method.
+ volumeGatherSettings:
+ # -- Only gather new log lines since this was deployed. Do not gather historical log lines.
+ # @section -- Logs Scrape: Pod Logs
+ onlyGatherNewLogLines: false
+
# PodLog Objects
podLogsObjects:
# -- Enable discovery of Grafana Alloy PodLogs objects.
# @section -- Logs Scrape: PodLog Objects
@@ -1878,8 +1919,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (eBPF)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (eBPF)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1898,8 +1943,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (java)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (java)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for Java profile sources.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Profiles (java)
extraRelabelingRules: ""
@@ -1921,8 +1970,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (pprof)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (pprof)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block)) |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-01 00:12:40.441548151 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-01 00:12:40.441548151 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-01 00:13:14.076742920 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-01 00:12:40.435548115 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-01 00:12:40.442548157 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-01 00:12:40.442548157 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-01 00:12:40.442548157 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-01 00:12:40.442548157 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-01 00:13:14.082742953 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-01 00:12:40.442548157 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-01 14:12:40.882283087 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-01 14:12:40.876283113 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-01 14:12:11.668402151 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-01 14:12:40.883283083 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-01 14:12:40.883283083 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-01 14:12:11.674402130 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-01 14:12:40.382285216 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-01 14:12:11.154403985 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-01 14:12:40.382285216 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-01 14:12:11.153403988 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-01 14:12:40.376285241 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-01 14:12:11.147404010 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-01 14:12:40.383285212 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-01 14:12:11.154403985 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-01 14:12:40.383285212 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-01 14:12:11.154403985 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-01 14:12:40.383285212 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-01 14:12:11.154403985 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-01 14:12:40.383285212 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-01 14:12:11.154403985 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-01 14:12:40.383285212 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-01 14:12:11.154403985 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Edited/Blocked NotificationRenovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR. You can manually request rebase by checking the rebase/retry box above. |
|
This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation. |
Changes Default Valuesdiff -U 4 -r out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out
--- out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out 2025-01-06 20:25:19.576478994 +0000
+++ out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out 2025-01-06 20:24:44.815880453 +0000
@@ -643,8 +643,16 @@
# @default -- 60s
# @section -- Metrics Job: Auto-Discovery
scrapeInterval: ""
+ # -- The list of namespaces to include in autodiscovery. If empty, all namespaces are included.
+ # @section -- Metrics Job: Auto-Discovery
+ namespaces: []
+
+ # -- The list of namespaces to exclude from autodiscovery.
+ # @section -- Metrics Job: Auto-Discovery
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for auto-discovered entities.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1464,8 +1472,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
extraRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ excludeMetrics: []
+
# -- Rule blocks to be added to the prometheus.relabel component for PodMonitor objects.
# These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no `__meta*` labels are present.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
@@ -1512,8 +1529,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (Probes)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1554,8 +1580,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1706,8 +1741,14 @@
# Format: `<structured metadata>: <Loki label>`.
# @section -- Logs Scrape: Pod Logs
structuredMetadata: {}
+ # Settings specific for gathering Pod logs using the "volumes" gather method.
+ volumeGatherSettings:
+ # -- Only gather new log lines since this was deployed. Do not gather historical log lines.
+ # @section -- Logs Scrape: Pod Logs
+ onlyGatherNewLogLines: false
+
# PodLog Objects
podLogsObjects:
# -- Enable discovery of Grafana Alloy PodLogs objects.
# @section -- Logs Scrape: PodLog Objects
@@ -1878,8 +1919,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (eBPF)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (eBPF)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1898,8 +1943,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (java)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (java)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for Java profile sources.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Profiles (java)
extraRelabelingRules: ""
@@ -1921,8 +1970,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (pprof)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (pprof)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block)) |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:24:43.603894908 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:24:43.603894908 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:25:18.385492356 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:24:43.596894992 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:24:43.603894908 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:25:18.391492288 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:25:18.893486659 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:24:44.110888861 +0000
@@ -812,18 +812,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -833,18 +823,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -854,18 +834,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1016,5 +986,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:25:18.900486581 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:24:44.119888754 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -821,18 +821,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -842,18 +832,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -863,18 +843,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1237,10 +1207,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:25:18.900486581 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:24:44.119888754 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:25:18.385492356 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:24:43.596894992 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:25:18.392492277 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:24:43.604894896 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:24:43.094900979 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:24:43.094900979 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:25:17.879498030 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:24:43.089901039 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:25:17.885497963 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:25:17.886497951 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:25:17.879498030 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:24:43.089901039 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -951,5 +936,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:25:17.886497951 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1172,10 +1157,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:25:17.886497951 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:24:43.095900967 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:25:19.402480951 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:24:44.636882588 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:25:19.409480873 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:25:19.410480862 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:25:19.410480862 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 20:24:44.643882505 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:25:19.402480951 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 20:24:44.636882588 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:25:19.410480862 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 20:24:44.644882493 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:25:19.410480862 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 20:24:44.644882493 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 20:24:44.117888778 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:25:18.892486670 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 20:24:44.110888861 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:25:18.899486592 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 20:24:44.118888766 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:14.290007071 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:40.761947452 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:14.282007088 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Default Valuesdiff -U 4 -r out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out
--- out-default-values/target/k8s-monitoring_k8s-monitoring_default-values.out 2025-01-06 22:15:41.919944897 +0000
+++ out-default-values/pr/k8s-monitoring_k8s-monitoring_default-values.out 2025-01-06 22:15:15.445004492 +0000
@@ -643,8 +643,16 @@
# @default -- 60s
# @section -- Metrics Job: Auto-Discovery
scrapeInterval: ""
+ # -- The list of namespaces to include in autodiscovery. If empty, all namespaces are included.
+ # @section -- Metrics Job: Auto-Discovery
+ namespaces: []
+
+ # -- The list of namespaces to exclude from autodiscovery.
+ # @section -- Metrics Job: Auto-Discovery
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for auto-discovered entities.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1464,8 +1472,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
extraRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (PodMonitors)
+ excludeMetrics: []
+
# -- Rule blocks to be added to the prometheus.relabel component for PodMonitor objects.
# These relabeling rules are applied post-scrape against the metrics returned from the scraped target, no `__meta*` labels are present.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (PodMonitors)
@@ -1512,8 +1529,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (Probes)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (Probes)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1554,8 +1580,17 @@
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#rule-block))
# @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
extraMetricRelabelingRules: ""
+ # Adjustments to the scraped metrics to filter the amount of data sent to storage.
+ metricsTuning:
+ # -- Metrics to keep. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ includeMetrics: []
+ # -- Metrics to drop. Can use regular expressions.
+ # @section -- Metrics Job: Prometheus Operator (ServiceMonitors)
+ excludeMetrics: []
+
# -- Sets the max_cache_size for cadvisor prometheus.relabel component.
# This should be at least 2x-5x your largest scrape target or samples appended rate.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.relabel/#arguments))
# Overrides metrics.maxCacheSize
@@ -1706,8 +1741,14 @@
# Format: `<structured metadata>: <Loki label>`.
# @section -- Logs Scrape: Pod Logs
structuredMetadata: {}
+ # Settings specific for gathering Pod logs using the "volumes" gather method.
+ volumeGatherSettings:
+ # -- Only gather new log lines since this was deployed. Do not gather historical log lines.
+ # @section -- Logs Scrape: Pod Logs
+ onlyGatherNewLogLines: false
+
# PodLog Objects
podLogsObjects:
# -- Enable discovery of Grafana Alloy PodLogs objects.
# @section -- Logs Scrape: PodLog Objects
@@ -1878,8 +1919,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (eBPF)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (eBPF)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
@@ -1898,8 +1943,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (java)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (java)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for Java profile sources.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block))
# @section -- Profiles (java)
extraRelabelingRules: ""
@@ -1921,8 +1970,12 @@
# -- Which namespaces to look for pods with profiles.
# @section -- Profiles (pprof)
namespaces: []
+ # -- Which namespaces to exclude looking for pods.
+ # @section -- Profiles (pprof)
+ excludeNamespaces: []
+
# -- Rule blocks to be added to the discovery.relabel component for eBPF profile sources.
# These relabeling rules are applied pre-scrape against the targets from service discovery.
# Before the scrape, any remaining target labels that start with `__` (i.e. `__meta_kubernetes*`) are dropped.
# ([docs](https://grafana.com/docs/alloy/latest/reference/components/discovery/discovery.relabel/#rule-block)) |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:41.256946360 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:14.781005974 +0000
@@ -812,18 +812,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -833,18 +823,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -854,18 +834,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1016,5 +986,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:14.788005959 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -821,18 +821,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -842,18 +832,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -863,18 +843,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
- rule {
- source_labels = ["namespace"]
- regex = "^kube-system$"
- action = "drop"
- }
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1237,10 +1207,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:14.788005959 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:40.768947436 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:14.291007068 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:40.761947452 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:14.283007086 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:40.769947434 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:14.292007066 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:40.769947434 +0000
+++ out/pr/k8s-monitoring/values-demo-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:14.292007066 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:40.269948537 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:13.786008196 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:40.275948524 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:40.276948522 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:13.792008182 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:40.269948537 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:13.786008196 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -951,5 +936,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:40.276948522 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:13.793008180 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1172,10 +1157,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:40.276948522 +0000
+++ out/pr/k8s-monitoring/values-k3d.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:13.793008180 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:15.283004854 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:15.283004854 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:41.751945268 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:15.278004865 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:41.757945254 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -231,10 +231,11 @@
Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
If unset, Prometheus uses its default value.
type: boolean
authorization:
- description: Authorization header configuration to authenticate
- against the Consul Server.
+ description: |-
+ Optional Authorization header configuration to authenticate against the Consul Server.
+ Cannot be set at the same time as `basicAuth`, or `oauth2`.
properties:
credentials:
description: Selects a key of a Secret in the namespace
that contains the credentials for authentication.
@@ -270,10 +271,11 @@
type: string
type: object
basicAuth:
description: |-
- BasicAuth information to authenticate against the Consul Server.
+ Optional BasicAuth information to authenticate against the Consul Server.
More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oauth2`.
properties:
password:
description: |-
`password` specifies a key of a Secret containing the password for
@@ -329,21 +331,33 @@
type: object
datacenter:
description: Consul Datacenter name, if not provided it will
use the local Consul Agent Datacenter.
+ minLength: 1
type: string
enableHTTP2:
description: |-
Whether to enable HTTP2.
If unset, Prometheus uses its default value.
type: boolean
+ filter:
+ description: |-
+ Filter expression used to filter the catalog results.
+ See https://www.consul.io/api-docs/catalog#list-services
+ It requires Prometheus >= 3.0.0.
+ minLength: 1
+ type: string
followRedirects:
description: |-
Configure whether HTTP requests follow HTTP 3xx redirects.
If unset, Prometheus uses its default value.
type: boolean
namespace:
- description: Namespaces are only supported in Consul Enterprise.
+ description: |-
+ Namespaces are only supported in Consul Enterprise.
+
+ It requires Prometheus >= 2.28.0.
+ minLength: 1
type: string
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -354,14 +368,17 @@
type: string
nodeMeta:
additionalProperties:
type: string
- description: Node metadata key/value pairs to filter nodes for
- a given service.
+ description: |-
+ Node metadata key/value pairs to filter nodes for a given service.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
type: object
x-kubernetes-map-type: atomic
oauth2:
- description: Optional OAuth 2.0 configuration.
+ description: |-
+ Optional OAuth2.0 configuration.
+ Cannot be set at the same time as `basicAuth`, or `authorization`.
properties:
clientId:
description: |-
`clientId` specifies a key of a Secret or ConfigMap containing the
@@ -686,8 +703,16 @@
- tokenUrl
type: object
partition:
description: Admin Partitions are only supported in Consul Enterprise.
+ minLength: 1
+ type: string
+ pathPrefix:
+ description: |-
+ Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+ It requires Prometheus >= 2.45.0.
+ minLength: 1
type: string
proxyConnectHeader:
additionalProperties:
items:
@@ -745,33 +770,35 @@
- HTTP
- HTTPS
type: string
server:
- description: A valid string consisting of a hostname or IP followed
- by an optional port number.
+ description: Consul server address. A valid string consisting
+ of a hostname or IP followed by an optional port number.
minLength: 1
type: string
services:
description: A list of services for which targets are retrieved.
If omitted, all services are scraped.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tagSeparator:
description: |-
The string by which Consul tags are joined into the tag label.
If unset, Prometheus uses its default value.
+ minLength: 1
type: string
tags:
- description: An optional list of tags used to filter nodes for
- a given service. Services must contain all tags in the list.
+ description: |-
+ An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+ Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
items:
type: string
type: array
- x-kubernetes-list-type: atomic
+ x-kubernetes-list-type: set
tlsConfig:
- description: TLS Config
+ description: TLS configuration to connect to the Consul API.
properties:
ca:
description: Certificate authority used when verifying server
certificates.
@@ -1352,8 +1379,11 @@
- tokenUrl
type: object
port:
description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
proxyConnectHeader:
additionalProperties:
items:
@@ -3378,8 +3408,11 @@
It requires Prometheus >= v2.49.0.
If unset, Prometheus uses true by default.
type: boolean
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
eurekaSDConfigs:
description: EurekaSDConfigs defines a list of Eureka service discovery
configurations.
items:
@@ -4041,8 +4074,20 @@
required:
- server
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
fileSDConfigs:
description: FileSDConfigs defines a list of file service discovery
configurations.
items:
@@ -11245,13 +11290,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
@@ -11467,5 +11514,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:41.758945252 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1010,8 +1010,20 @@
It requires Prometheus >= v2.48.0.
type: boolean
type: object
type: array
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
`jobLabel` selects the label from the associated Kubernetes `Service`
object which will be used as the `job` label for all metrics.
@@ -1123,13 +1135,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1178,8 +1192,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLabels:
description: |-
`targetLabels` defines the labels which are transferred from the
associated Kubernetes `Service` object onto the ingested metrics.
@@ -1202,5 +1228,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:41.758945252 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1025,10 +1025,12 @@
type: object
type: object
alertDropLabels:
description: |-
- AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts.
- The replica label `thanos_ruler_replica` will always be dropped in alerts.
+ Configures the label names which should be dropped in Thanos Ruler
+ alerts.
+
+ The replica label `thanos_ruler_replica` will always be dropped from the alerts.
items:
type: string
type: array
alertQueryUrl:
@@ -1038,17 +1040,29 @@
Maps to the '--alert.query-url' CLI arg.
type: string
alertRelabelConfigFile:
description: |-
- AlertRelabelConfigFile specifies the path of the alert relabeling configuration file.
- When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence.
+ Configures the path to the alert relabeling configuration file.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
+ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `alertRelabelConfig`.
type: string
alertRelabelConfigs:
description: |-
- AlertRelabelConfigs configures alert relabeling in ThanosRuler.
- Alert relabel configurations must have the form as specified in the official Prometheus documentation:
+ Configures alert relabeling in Thanos Ruler.
+
+ Alert relabel configuration must have the form as specified in the
+ official Prometheus documentation:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
- Alternative to AlertRelabelConfigFile, and lower order priority.
+
+ The operator performs no validation of the configuration.
+
+ `alertRelabelConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1070,10 +1084,17 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersConfig:
description: |-
- Define configuration for connecting to alertmanager. Only available with thanos v0.10.0
- and higher. Maps to the `alertmanagers.config` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+ It requires Thanos >= v0.10.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `alertmanagersUrl`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -1095,12 +1116,13 @@
type: object
x-kubernetes-map-type: atomic
alertmanagersUrl:
description: |-
- Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher,
- AlertManagersConfig should be used instead. Note: this field will be ignored
- if AlertManagersConfig is specified.
- Maps to the `alertmanagers.url` arg.
+ Configures the list of Alertmanager endpoints to send alerts to.
+
+ For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+ `alertmanagersConfig` takes precedence over this field.
items:
type: string
type: array
containers:
@@ -1350,9 +1372,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1365,9 +1388,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1414,10 +1438,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1428,10 +1452,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1461,9 +1485,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1476,9 +1501,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1525,10 +1551,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1539,10 +1565,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1568,9 +1594,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1589,9 +1616,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1608,9 +1635,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1675,10 +1702,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -1780,9 +1806,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1801,9 +1828,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1820,9 +1847,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1887,10 +1914,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2236,9 +2262,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2257,9 +2284,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2276,9 +2303,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2343,10 +2370,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3120,9 +3146,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3135,9 +3162,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3184,10 +3212,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3198,10 +3226,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3231,9 +3259,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3246,9 +3275,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3295,10 +3325,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3309,10 +3339,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3338,9 +3368,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3359,9 +3390,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3378,9 +3409,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3445,10 +3476,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3550,9 +3580,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3571,9 +3602,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3590,9 +3621,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3657,10 +3688,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4006,9 +4036,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4027,9 +4058,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4046,9 +4077,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4113,10 +4144,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4302,10 +4332,12 @@
labels:
additionalProperties:
type: string
description: |-
- Labels configure the external label pairs to ThanosRuler. A default replica label
- `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts.
+ Configures the external label pairs of the ThanosRuler resource.
+
+ A default replica label `thanos_ruler_replica` will be always added as a
+ label with the value of the pod's name.
type: object
listenLocal:
description: |-
ListenLocal makes the Thanos ruler listen on loopback, so that it
@@ -4341,10 +4373,15 @@
description: Define which Nodes the Pods are scheduled on.
type: object
objectStorageConfig:
description: |-
- ObjectStorageConfig configures object storage in Thanos.
- Alternative to ObjectStorageConfigFile, and lower order priority.
+ Configures object storage.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration.
+
+ `objectStorageConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4366,10 +4403,15 @@
type: object
x-kubernetes-map-type: atomic
objectStorageConfigFile:
description: |-
- ObjectStorageConfigFile specifies the path of the object storage configuration file.
- When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence.
+ Configures the path of the object storage configuration file.
+
+ The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `objectStorageConfig`.
type: string
paused:
description: |-
When a ThanosRuler deployment is paused, no actions except for deletion
@@ -4447,12 +4489,17 @@
type: object
type: array
queryConfig:
description: |-
- Define configuration for connecting to thanos query instances.
- If this is defined, the QueryEndpoints field will be ignored.
- Maps to the `query.config` CLI argument.
- Only available with thanos v0.11.0 and higher.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+ It requires Thanos >= v0.11.0.
+
+ The operator performs no validation of the configuration.
+
+ This field takes precedence over `queryEndpoints`.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -4474,10 +4521,13 @@
type: object
x-kubernetes-map-type: atomic
queryEndpoints:
description: |-
- QueryEndpoints defines Thanos querier endpoints from which to query metrics.
- Maps to the --query flag of thanos ruler.
+ Configures the list of Thanos Query endpoints from which to query metrics.
+
+ For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+ `queryConfig` takes precedence over this field.
items:
type: string
type: array
replicas:
@@ -4605,10 +4655,11 @@
type: object
x-kubernetes-map-type: atomic
ruleSelector:
description: |-
- A label selector to select which PrometheusRules to mount for alerting and
- recording.
+ PrometheusRule objects to be selected for rule evaluation. An empty
+ label selector matches all objects. A null label selector matches no
+ objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
@@ -4732,8 +4783,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -5525,20 +5602,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -5803,14 +5877,18 @@
type: object
type: array
tracingConfig:
description: |-
- TracingConfig configures tracing in Thanos.
+ Configures tracing.
- `tracingConfigFile` takes precedence over this field.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration.
+
+ `tracingConfigFile` takes precedence over this field.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
@@ -5832,14 +5910,18 @@
type: object
x-kubernetes-map-type: atomic
tracingConfigFile:
description: |-
- TracingConfig specifies the path of the tracing configuration file.
+ Configures the path of the tracing configuration file.
- This field takes precedence over `tracingConfig`.
+ The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
This is an *experimental feature*, it may change in any upcoming release
in a breaking way.
+
+ The operator performs no validation of the configuration file.
+
+ This field takes precedence over `tracingConfig`.
type: string
version:
description: Version of Thanos to be deployed.
type: string
@@ -5921,8 +6003,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -5952,10 +6036,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -5991,10 +6077,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6011,10 +6099,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6064,8 +6153,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6173,10 +6264,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -6640,8 +6730,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -6685,11 +6776,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -6703,8 +6794,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -6738,9 +6831,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -6762,8 +6855,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -6971,10 +7065,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -6988,10 +7083,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7354,10 +7452,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7394,8 +7493,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -7466,10 +7566,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -7599,10 +7700,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7645,10 +7747,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -7958,11 +8062,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8009,5 +8115,5 @@
subresources:
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:41.752945265 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/alloy-config.yaml 2025-01-06 22:15:15.278004865 +0000
@@ -767,13 +767,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -783,13 +778,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -799,13 +789,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -975,5 +960,5 @@
}
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
- grafana_kubernetes_monitoring_build_info{version="1.6.13", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
+ grafana_kubernetes_monitoring_build_info{version="1.6.16", namespace="default", metrics="enabled,alloy,autoDiscover,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor,apiserver,cost,extraConfig", logs="enabled,events,pod_logs", traces="disabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:41.758945252 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/hooks/validate-configuration.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@@ -776,13 +776,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.podmonitors.receiver]
- }
-
- prometheus.relabel "podmonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator Probe objects
@@ -792,13 +787,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.probes.receiver]
- }
-
- prometheus.relabel "probes" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Prometheus Operator ServiceMonitor objects
@@ -808,13 +798,8 @@
}
scrape {
default_scrape_interval = "60s"
}
- forward_to = [prometheus.relabel.servicemonitors.receiver]
- }
-
- prometheus.relabel "servicemonitors" {
- max_cache_size = 100000
forward_to = [prometheus.relabel.metrics_service.receiver]
}
// Metrics Service
@@ -1196,10 +1181,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
diff -U 4 -r out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml
--- out/target/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:41.758945252 +0000
+++ out/pr/k8s-monitoring/values-metalstack.yaml/sx-k8s-monitoring/charts/k8s-monitoring/templates/tests/test.yaml 2025-01-06 22:15:15.284004851 +0000
@@ -7,10 +7,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
"helm.sh/hook-weight": "-1"
@@ -69,10 +69,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -81,9 +81,9 @@
nodeSelector:
kubernetes.io/os: linux
containers:
- name: config-analysis
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
value: release-name-alloy.default.svc:12345
@@ -96,10 +96,10 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- app.kubernetes.io/version: 2.9.0
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ app.kubernetes.io/version: 2.10.0
+ helm.sh/chart: "k8s-monitoring-1.6.16"
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": before-hook-creation
"helm.sh/hook-weight": "0"
@@ -113,16 +113,16 @@
namespace: default
labels:
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "release-name"
- helm.sh/chart: "k8s-monitoring-1.6.13"
+ helm.sh/chart: "k8s-monitoring-1.6.16"
spec:
restartPolicy: Never
nodeSelector:
kubernetes.io/os: linux
containers:
- name: query-test
- image: ghcr.io/grafana/k8s-monitoring-test:1.6.13
+ image: ghcr.io/grafana/k8s-monitoring-test:1.6.16
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
mountPath: /etc/test
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:41.262946346 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
@@ -29,9 +29,9 @@
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
k8s.grafana.com/logs.job: integrations/node_exporter
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:41.262946346 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/service.yaml 2025-01-06 22:15:14.786005963 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:41.255946362 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-node-exporter/templates/serviceaccount.yaml 2025-01-06 22:15:14.781005974 +0000
@@ -5,9 +5,9 @@
metadata:
name: release-name-prometheus-node-exporter
namespace: default
labels:
- helm.sh/chart: prometheus-node-exporter-4.42.0
+ helm.sh/chart: prometheus-node-exporter-4.43.0
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: metrics
app.kubernetes.io/part-of: prometheus-node-exporter
app.kubernetes.io/name: prometheus-node-exporter
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -6896,8 +6896,14 @@
type: object
message:
description: Message template
type: string
+ messageThreadID:
+ description: |-
+ The Telegram Group Topic ID.
+ It requires Alertmanager >= 0.26.0.
+ format: int64
+ type: integer
parseMode:
description: Parse mode for telegram message
enum:
- MarkdownV2
@@ -10031,5 +10037,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -2356,9 +2356,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2371,9 +2372,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2420,10 +2422,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2434,10 +2436,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2467,9 +2469,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2482,9 +2485,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2531,10 +2535,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2545,10 +2549,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2574,9 +2578,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2595,9 +2600,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2614,9 +2619,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2681,10 +2686,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2786,9 +2790,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2807,9 +2812,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2826,9 +2831,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2893,10 +2898,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3242,9 +3246,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3263,9 +3268,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3282,9 +3287,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3349,10 +3354,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3922,9 +3926,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3937,9 +3942,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3986,10 +3992,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4000,10 +4006,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4033,9 +4039,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4048,9 +4055,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4097,10 +4105,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4111,10 +4119,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4140,9 +4148,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4161,9 +4170,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4180,9 +4189,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4247,10 +4256,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4352,9 +4360,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4373,9 +4382,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4392,9 +4401,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4459,10 +4468,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4808,9 +4816,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4829,9 +4838,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4848,9 +4857,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4915,10 +4924,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5140,8 +5148,31 @@
description: |-
If set to true all actions on the underlying managed objects are not
goint to be performed, except for delete actions.
type: boolean
+ persistentVolumeClaimRetentionPolicy:
+ description: |-
+ The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+ The default behavior is all PVCs are retained.
+ This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+ It requires enabling the StatefulSetAutoDeletePVC feature gate.
+ properties:
+ whenDeleted:
+ description: |-
+ WhenDeleted specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+ of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+ `Delete` policy causes those PVCs to be deleted.
+ type: string
+ whenScaled:
+ description: |-
+ WhenScaled specifies what happens to PVCs created from StatefulSet
+ VolumeClaimTemplates when the StatefulSet is scaled down. The default
+ policy of `Retain` causes PVCs to not be affected by a scaledown. The
+ `Delete` policy causes the associated PVCs for any excess pods above
+ the replica count to be deleted.
+ type: string
+ type: object
podMetadata:
description: |-
PodMetadata configures labels and annotations which are propagated to the Alertmanager pods.
@@ -5359,8 +5390,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -6161,20 +6218,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -6526,8 +6580,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -6557,10 +6613,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -6596,10 +6654,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -6616,10 +6676,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -6669,8 +6730,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -6778,10 +6841,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -7245,8 +7307,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -7290,11 +7353,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -7308,8 +7371,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -7343,9 +7408,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -7367,8 +7432,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -7576,10 +7642,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -7593,10 +7660,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -7959,10 +8029,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -7999,8 +8070,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -8071,10 +8143,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -8204,10 +8277,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -8250,10 +8324,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -8575,11 +8651,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -8634,5 +8712,5 @@
statusReplicasPath: .status.replicas
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -77,8 +77,20 @@
It requires Prometheus >= v2.28.0.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
jobLabel:
description: |-
The label to use to retrieve the job name from.
`jobLabel` selects the label from the associated Kubernetes `Pod`
@@ -759,12 +771,18 @@
If empty, Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: |-
- Name of the Pod port which this endpoint refers to.
+ The `Pod` port name which exposes the endpoint.
- It takes precedence over `targetPort`.
+ It takes precedence over the `portNumber` and `targetPort` fields.
type: string
+ portNumber:
+ description: The `Pod` port number which exposes the endpoint.
+ format: int32
+ maximum: 65535
+ minimum: 1
+ type: integer
proxyUrl:
description: |-
`proxyURL` configures the HTTP Proxy URL (e.g.
"http://proxyserver:2195") to go through when scraping the target.
@@ -891,9 +909,9 @@
description: |-
Name or number of the target port of the `Pod` object behind the Service, the
port must be specified with container port property.
- Deprecated: use 'port' instead.
+ Deprecated: use 'port' or 'portNumber' instead.
x-kubernetes-int-or-string: true
tlsConfig:
description: TLS configuration to use when scraping the target.
properties:
@@ -1103,13 +1121,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
selector:
@@ -1158,8 +1178,20 @@
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
+ selectorMechanism:
+ description: |-
+ Mechanism used to select the endpoints to scrape.
+ By default, the selection process relies on relabel configurations to filter the discovered targets.
+ Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
+ Which strategy is best for your use case needs to be carefully evaluated.
+
+ It requires Prometheus >= v2.17.0.
+ enum:
+ - RelabelConfig
+ - RoleSelector
+ type: string
targetLimit:
description: |-
`targetLimit` defines a limit on the number of scraped targets that will
be accepted.
@@ -1174,5 +1206,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml |
Changes Rendered Chartdiff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -173,8 +173,20 @@
required:
- key
type: object
x-kubernetes-map-type: atomic
+ fallbackScrapeProtocol:
+ description: |-
+ The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ - PrometheusText1.0.0
+ type: string
interval:
description: |-
Interval at which targets are probed using the configured prober.
If not specified Prometheus' global scrape interval is used.
@@ -698,13 +710,15 @@
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -1159,5 +1173,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1665,9 +1665,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1680,9 +1681,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1729,10 +1731,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1743,10 +1745,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1776,9 +1778,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1791,9 +1794,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1840,10 +1844,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -1854,10 +1858,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -1883,9 +1887,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -1904,9 +1909,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -1923,9 +1928,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -1990,10 +1995,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2095,9 +2099,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2116,9 +2121,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2135,9 +2140,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2202,10 +2207,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2551,9 +2555,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2572,9 +2577,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2591,9 +2596,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2658,10 +2663,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2911,8 +2915,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -3454,9 +3466,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3469,9 +3482,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3518,10 +3532,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3532,10 +3546,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3565,9 +3579,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3580,9 +3595,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3629,10 +3645,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -3643,10 +3659,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -3672,9 +3688,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3693,9 +3710,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3712,9 +3729,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3779,10 +3796,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3884,9 +3900,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3905,9 +3922,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3924,9 +3941,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3991,10 +4008,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4340,9 +4356,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4361,9 +4378,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4380,9 +4397,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4447,10 +4464,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4719,8 +4735,15 @@
enum:
- StatefulSet
- DaemonSet
type: string
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -4738,8 +4761,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6238,8 +6271,20 @@
HTTP routes of a request, and the actual ExternalURL is still true, but
the server serves requests under a different route prefix. For example
for use with `kubectl proxy`.
type: string
+ runtime:
+ description: RuntimeConfig configures the values for the Prometheus
+ process behavior
+ properties:
+ goGC:
+ description: |-
+ The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+ See: https://tip.golang.org/doc/gc-guide#GOGC
+ format: int32
+ minimum: -1
+ type: integer
+ type: object
sampleLimit:
description: |-
SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
Only valid in Prometheus versions 2.45.0 and newer.
@@ -6271,8 +6316,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -6783,21 +6871,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -6895,8 +6987,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -7146,21 +7264,30 @@
type: object
x-kubernetes-map-type: atomic
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -7822,20 +7949,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -8446,8 +8570,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -8477,10 +8603,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -8516,10 +8644,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -8536,10 +8666,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -8589,8 +8720,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -8698,10 +8831,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -9165,8 +9297,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -9210,11 +9343,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -9228,8 +9361,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -9263,9 +9398,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -9287,8 +9422,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -9496,10 +9632,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -9513,10 +9650,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -9879,10 +10019,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -9919,8 +10060,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -9991,10 +10133,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -10124,10 +10267,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -10170,10 +10314,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -10501,11 +10647,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -10604,5 +10752,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -1238,9 +1238,15 @@
type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
- It can be "v1" or "v2".
+ It can be "V1" or "V2".
+ The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+ enum:
+ - v1
+ - V1
+ - v2
+ - V2
type: string
authorization:
description: |-
Authorization section for Alertmanager.
@@ -1362,8 +1368,16 @@
If not set, the object will be discovered in the namespace of the
Prometheus object.
minLength: 1
type: string
+ 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 or Alertmanager >= 0.25.0.
+ type: string
pathPrefix:
description: Prefix for the HTTP path alerts are pushed
to.
type: string
@@ -1372,8 +1386,53 @@
- type: integer
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ 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 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to
+ use.'
+ pattern: ^http(s)?://.+$
+ type: string
relabelings:
description: Relabel configuration applied to the discovered
Alertmanagers.
items:
@@ -2344,9 +2403,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2359,9 +2419,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2408,10 +2469,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2422,10 +2483,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2455,9 +2516,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2470,9 +2532,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2519,10 +2582,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -2533,10 +2596,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -2562,9 +2625,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2583,9 +2647,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2602,9 +2666,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2669,10 +2733,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -2774,9 +2837,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -2795,9 +2859,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -2814,9 +2878,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -2881,10 +2945,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3230,9 +3293,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -3251,9 +3315,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -3270,9 +3334,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -3337,10 +3401,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -3523,9 +3586,12 @@
- name
type: object
type: array
disableCompaction:
- description: When true, the Prometheus compaction is disabled.
+ description: |-
+ When true, the Prometheus compaction is disabled.
+ When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+ disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
type: boolean
dnsConfig:
description: Defines the DNS configuration for the pods.
properties:
@@ -3605,8 +3671,16 @@
minLength: 1
type: string
type: array
x-kubernetes-list-type: set
+ enableOTLPReceiver:
+ description: |-
+ Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+ Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+ It requires Prometheus >= v2.47.0.
+ type: boolean
enableRemoteWriteReceiver:
description: |-
Enable Prometheus to be used as a receiver for the Prometheus remote
write protocol.
@@ -4172,9 +4246,10 @@
Other management of the container blocks until the hook completes.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4187,9 +4262,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4236,10 +4312,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4250,10 +4326,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4283,9 +4359,10 @@
or until the termination grace period is reached.
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in
+ the container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4298,9 +4375,10 @@
type: array
x-kubernetes-list-type: atomic
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to
+ perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4347,10 +4425,10 @@
required:
- port
type: object
sleep:
- description: Sleep represents the duration that the
- container should sleep before being terminated.
+ description: Sleep represents a duration that the container
+ should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
sleep.
@@ -4361,10 +4439,10 @@
type: object
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
- for the backward compatibility. There are no validation of this field and
- lifecycle hooks will fail in runtime when tcp handler is specified.
+ for backward compatibility. There is no validation of this field and
+ lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
defaults to the pod IP.'
@@ -4390,9 +4468,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4411,9 +4490,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4430,9 +4509,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4497,10 +4576,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -4602,9 +4680,10 @@
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -4623,9 +4702,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -4642,9 +4721,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -4709,10 +4788,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5058,9 +5136,10 @@
This cannot be updated.
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
- description: Exec specifies the action to take.
+ description: Exec specifies a command to execute in the
+ container.
properties:
command:
description: |-
Command is the command line to execute inside the container, the working directory for the
@@ -5079,9 +5158,9 @@
Defaults to 3. Minimum value is 1.
format: int32
type: integer
grpc:
- description: GRPC specifies an action involving a GRPC port.
+ description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
must be in the range 1 to 65535.
@@ -5098,9 +5177,9 @@
required:
- port
type: object
httpGet:
- description: HTTPGet specifies the http request to perform.
+ description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Host name to connect to, defaults to the pod IP. You probably want to set
@@ -5165,10 +5244,9 @@
Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
format: int32
type: integer
tcpSocket:
- description: TCPSocket specifies an action involving a TCP
- port.
+ description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
to the pod IP.'
@@ -5427,8 +5505,15 @@
This is an alpha field from kubernetes 1.22 until 1.24 which requires
enabling the StatefulSetMinReadySeconds feature gate.
format: int32
type: integer
+ nameValidationScheme:
+ description: Specifies the validation scheme for metric and label
+ names.
+ enum:
+ - UTF8
+ - Legacy
+ type: string
nodeSelector:
additionalProperties:
type: string
description: Defines on which Nodes the Pods are scheduled.
@@ -5446,8 +5531,18 @@
type: string
minItems: 1
type: array
x-kubernetes-list-type: set
+ translationStrategy:
+ description: |-
+ Configures how the OTLP receiver endpoint translates the incoming metrics.
+ If unset, Prometheus uses its default value.
+
+ It requires Prometheus >= v3.0.0.
+ enum:
+ - NoUTF8EscapingWithSuffixes
+ - UnderscoreEscapingWithSuffixes
+ type: string
type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -7929,8 +8024,51 @@
The Prometheus service account must have the `list` and `watch`
permissions on the `Nodes` objects.
type: boolean
type: object
+ authorization:
+ description: |-
+ Authorization section for the ScrapeClass.
+ It will only apply if the scrape resource doesn't specify any Authorization.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace
+ that contains the credentials for authentication.
+ 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
+ credentialsFile:
+ description: File to read a secret from, mutually exclusive
+ with `credentials`.
+ type: string
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
default:
description: |-
Default indicates that the scrape applies to all scrape objects that
don't configure an explicit scrape class name.
@@ -8441,21 +8579,25 @@
If unset, Prometheus uses its default value.
It requires Prometheus >= v2.49.0.
+
+ `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
items:
description: |-
ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
Supported values are:
* `OpenMetricsText0.0.1`
* `OpenMetricsText1.0.0`
* `PrometheusProto`
* `PrometheusText0.0.4`
+ * `PrometheusText1.0.0`
enum:
- PrometheusProto
- OpenMetricsText0.0.1
- OpenMetricsText1.0.0
- PrometheusText0.0.4
+ - PrometheusText1.0.0
type: string
type: array
x-kubernetes-list-type: set
scrapeTimeout:
@@ -8553,8 +8695,34 @@
for that container.
Note that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
+ seLinuxChangePolicy:
+ description: |-
+ seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+ It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+ Valid values are "MountOption" and "Recursive".
+
+ "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+ This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+ "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+ This requires all Pods that share the same volume to use the same SELinux label.
+ It is not possible to share the same volume among privileged and unprivileged Pods.
+ Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+ whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+ CSIDriver instance. Other volumes are always re-labelled recursively.
+ "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+ If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+ If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+ and "Recursive" for all other volumes.
+
+ This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+ All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+ Note that this field cannot be set when spec.os.name is windows.
+ type: string
seLinuxOptions:
description: |-
The SELinux context to be applied to all containers.
If unspecified, the container runtime will allocate a random SELinux context for each
@@ -8808,21 +8976,30 @@
digest can be specified as part of the image name.'
type: string
shards:
description: |-
- Number of shards to distribute targets onto. `spec.replicas`
- multiplied by `spec.shards` is the total number of Pods created.
+ Number of shards to distribute scraped targets onto.
- Note that scaling down shards will not reshard data onto remaining
+ `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+ being created.
+
+ When not defined, the operator assumes only one shard.
+
+ Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or
remote write data to a central location.
+ Alerting and recording rules
- Sharding is performed on the content of the `__address__` target meta-label
- for PodMonitors and ServiceMonitors and `__param_target__` for Probes.
-
- Default: 1
+ By default, the sharding is performed on:
+ * The `__address__` target's metadata label for PodMonitor,
+ ServiceMonitor and ScrapeConfig resources.
+ * The `__param_target__` label for Probe resources.
+
+ Users can define their own sharding implementation by setting the
+ `__tmp_hash` label during the target discovery with relabeling
+ configuration (either in the monitoring resources or via scrape class).
format: int32
type: integer
storage:
description: Storage defines the storage used by Prometheus.
@@ -9484,20 +9661,17 @@
for condition's last transition. If it reports "Resizing" that means the underlying
persistent volume is being resized.
type: string
status:
+ description: |-
+ Status is the status of the condition.
+ Can be True, False, Unknown.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
type: string
type:
description: |-
- PersistentVolumeClaimConditionType defines the condition of PV claim.
- Valid values are:
- - "Resizing", "FileSystemResizePending"
-
- If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- - "ControllerResizeError", "NodeResizeError"
-
- If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- - "ModifyVolumeError", "ModifyingVolume"
+ Type is the type of the condition.
+ More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
type: string
required:
- status
- type
@@ -10625,8 +10799,10 @@
awsElasticBlockStore:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+ awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
properties:
fsType:
description: |-
@@ -10656,10 +10832,12 @@
required:
- volumeID
type: object
azureDisk:
- description: azureDisk represents an Azure Data Disk mount on
- the host and bind mount to the pod.
+ description: |-
+ azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+ Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+ are redirected to the disk.csi.azure.com CSI driver.
properties:
cachingMode:
description: 'cachingMode is the Host Caching mode: None,
Read Only, Read Write.'
@@ -10695,10 +10873,12 @@
- diskName
- diskURI
type: object
azureFile:
- description: azureFile represents an Azure File Service mount
- on the host and bind mount to the pod.
+ description: |-
+ azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+ Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+ are redirected to the file.csi.azure.com CSI driver.
properties:
readOnly:
description: |-
readOnly defaults to false (read/write). ReadOnly here will force
@@ -10715,10 +10895,11 @@
- secretName
- shareName
type: object
cephfs:
- description: cephFS represents a Ceph FS mount on the host that
- shares a pod's lifetime
+ description: |-
+ cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+ Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
properties:
monitors:
description: |-
monitors is Required: Monitors is a collection of Ceph monitors
@@ -10768,8 +10949,10 @@
type: object
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
+ Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+ are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
properties:
fsType:
description: |-
@@ -10877,10 +11060,9 @@
type: object
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral
- storage that is handled by certain external CSI drivers (Beta
- feature).
+ storage that is handled by certain external CSI drivers.
properties:
driver:
description: |-
driver is the name of the CSI driver that handles this volume.
@@ -11344,8 +11526,9 @@
flexVolume:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
+ Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
properties:
driver:
description: driver is the name of the driver to use for
this volume.
@@ -11389,11 +11572,11 @@
required:
- driver
type: object
flocker:
- description: flocker represents a Flocker volume attached to
- a kubelet's host machine. This depends on the Flocker control
- service being running
+ description: |-
+ flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+ Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
properties:
datasetName:
description: |-
datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
@@ -11407,8 +11590,10 @@
gcePersistentDisk:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
+ Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+ gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
properties:
fsType:
description: |-
@@ -11442,9 +11627,9 @@
type: object
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
- DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
+ Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
properties:
directory:
@@ -11466,8 +11651,9 @@
type: object
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+ Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
properties:
endpoints:
description: |-
@@ -11675,10 +11861,11 @@
required:
- claimName
type: object
photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets host machine
+ description: |-
+ photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+ Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -11692,10 +11879,13 @@
required:
- pdID
type: object
portworxVolume:
- description: portworxVolume represents a portworx volume attached
- and mounted on kubelets host machine
+ description: |-
+ portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+ Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+ are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+ is on.
properties:
fsType:
description: |-
fSType represents the filesystem type to mount
@@ -12058,10 +12248,11 @@
type: array
x-kubernetes-list-type: atomic
type: object
quobyte:
- description: quobyte represents a Quobyte mount on the host
- that shares a pod's lifetime
+ description: |-
+ quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+ Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
properties:
group:
description: |-
group to map volume access to
@@ -12098,8 +12289,9 @@
type: object
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+ Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
properties:
fsType:
description: |-
@@ -12170,10 +12362,11 @@
- image
- monitors
type: object
scaleIO:
- description: scaleIO represents a ScaleIO persistent volume
- attached and mounted on Kubernetes nodes.
+ description: |-
+ scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+ Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
properties:
fsType:
default: xfs
description: |-
@@ -12303,10 +12496,11 @@
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
type: object
storageos:
- description: storageOS represents a StorageOS volume attached
- and mounted on Kubernetes nodes.
+ description: |-
+ storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+ Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
properties:
fsType:
description: |-
fsType is the filesystem type to mount.
@@ -12349,10 +12543,12 @@
Namespaces that do not pre-exist within StorageOS will be created.
type: string
type: object
vsphereVolume:
- description: vsphereVolume represents a vSphere volume attached
- and mounted on kubelets host machine
+ description: |-
+ vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+ Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+ are redirected to the csi.vsphere.vmware.com CSI driver.
properties:
fsType:
description: |-
fsType is filesystem type to mount.
@@ -12680,11 +12876,13 @@
description: Reason for the condition's last transition.
type: string
status:
description: Status of the condition.
+ minLength: 1
type: string
type:
description: Type of the condition being reported.
+ minLength: 1
type: string
required:
- lastTransitionTime
- status
@@ -12783,5 +12981,5 @@
statusReplicasPath: .status.shards
status: {}
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
diff -U 4 -r out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
--- out/target/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:41.263946344 +0000
+++ out/pr/k8s-monitoring/values-uibklab.yaml/sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml 2025-01-06 22:15:14.787005961 +0000
@@ -3,10 +3,10 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.4
- operator.prometheus.io/version: 0.78.2
+ controller-gen.kubebuilder.io/version: v0.16.5
+ operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
names:
@@ -58,8 +58,18 @@
description: Interval determines how often rules in the group
are evaluated.
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
+ labels:
+ additionalProperties:
+ type: string
+ description: |-
+ Labels to add or overwrite before storing the result for its rules.
+ The labels defined at the rule level take precedence.
+
+ It requires Prometheus >= 3.0.0.
+ The field is ignored for Thanos Ruler.
+ type: object
limit:
description: |-
Limit the number of alerts an alerting rule and series a recording
rule can produce.
@@ -149,5 +159,5 @@
served: true
storage: true
---
# Source: sx-k8s-monitoring/charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
1.6.13->1.6.16Release Notes
grafana/helm-charts (k8s-monitoring)
v1.6.16Compare Source
A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
Source commit: grafana/k8s-monitoring-helm@6a381c3
Tag on source: https://github.com/grafana/k8s-monitoring-helm/releases/tag/v1.6.16
v1.6.15Compare Source
A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
Source commit: grafana/k8s-monitoring-helm@68a348d
Tag on source: https://github.com/grafana/k8s-monitoring-helm/releases/tag/v1.6.15
v1.6.14Compare Source
A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
Source commit: grafana/k8s-monitoring-helm@af734d1
Tag on source: https://github.com/grafana/k8s-monitoring-helm/releases/tag/v1.6.14
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Mend Renovate. View the repository job log.