diff --git a/packages/rancher-monitoring/generated-changes/overlay/templates/grafana/dashboards-1.14/alertmanager-overview.yaml b/packages/rancher-monitoring/generated-changes/overlay/templates/grafana/dashboards-1.14/alertmanager-overview.yaml new file mode 100644 index 000000000..2135644ab --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/overlay/templates/grafana/dashboards-1.14/alertmanager-overview.yaml @@ -0,0 +1,610 @@ +{{- /* +Generated from 'alertmanager-overview' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml +Do not change in-place! In order to change this file first read following link: +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack +*/ -}} +{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} +{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards) (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "alertmanager-overview" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} + labels: + {{- if $.Values.grafana.sidecar.dashboards.label }} + {{ $.Values.grafana.sidecar.dashboards.label }}: "1" + {{- end }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} +data: + alertmanager-overview.json: |- + { + "__inputs": [ + + ], + "__requires": [ + + ], + "annotations": { + "list": [ + + ] + }, + "editable": false, + "gnetId": null, + "graphTooltip": 1, + "hideControls": false, + "id": null, + "links": [ + + ], + "refresh": "30s", + "rows": [ + { + "collapse": false, + "collapsed": false, + "panels": [ + { + "aliasColors": { + + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "fillGradient": 0, + "gridPos": { + + }, + "id": 2, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": null, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ + + ], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + "seriesOverrides": [ + + ], + "spaceLength": 10, + "span": 6, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum(alertmanager_alerts{namespace=\"$namespace\",service=\"$service\"}) by (namespace,service,instance)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}}", + "refId": "A" + } + ], + "thresholds": [ + + ], + "timeFrom": null, + "timeShift": null, + "title": "Alerts", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ + + ] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": { + + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "fillGradient": 0, + "gridPos": { + + }, + "id": 3, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": null, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ + + ], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + "seriesOverrides": [ + + ], + "spaceLength": 10, + "span": 6, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum(rate(alertmanager_alerts_received_total{namespace=\"$namespace\",service=\"$service\"}[5m])) by (namespace,service,instance)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} Received", + "refId": "A" + }, + { + "expr": "sum(rate(alertmanager_alerts_invalid_total{namespace=\"$namespace\",service=\"$service\"}[5m])) by (namespace,service,instance)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} Invalid", + "refId": "B" + } + ], + "thresholds": [ + + ], + "timeFrom": null, + "timeShift": null, + "title": "Alerts receive rate", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ + + ] + }, + "yaxes": [ + { + "format": "ops", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "ops", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Alerts", + "titleSize": "h6", + "type": "row" + }, + { + "collapse": false, + "collapsed": false, + "panels": [ + { + "aliasColors": { + + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "fillGradient": 0, + "gridPos": { + + }, + "id": 4, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": null, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ + + ], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": "integration", + "seriesOverrides": [ + + ], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum(rate(alertmanager_notifications_total{namespace=\"$namespace\",service=\"$service\", integration=\"$integration\"}[5m])) by (integration,namespace,service,instance)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} Total", + "refId": "A" + }, + { + "expr": "sum(rate(alertmanager_notifications_failed_total{namespace=\"$namespace\",service=\"$service\", integration=\"$integration\"}[5m])) by (integration,namespace,service,instance)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} Failed", + "refId": "B" + } + ], + "thresholds": [ + + ], + "timeFrom": null, + "timeShift": null, + "title": "$integration: Notifications Send Rate", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ + + ] + }, + "yaxes": [ + { + "format": "ops", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "ops", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": { + + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "fillGradient": 0, + "gridPos": { + + }, + "id": 5, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": null, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ + + ], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": "integration", + "seriesOverrides": [ + + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "histogram_quantile(0.99,\n sum(rate(alertmanager_notification_latency_seconds_bucket{namespace=\"$namespace\",service=\"$service\", integration=\"$integration\"}[5m])) by (le,namespace,service,instance)\n) \n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} 99th Percentile", + "refId": "A" + }, + { + "expr": "histogram_quantile(0.50,\n sum(rate(alertmanager_notification_latency_seconds_bucket{namespace=\"$namespace\",service=\"$service\", integration=\"$integration\"}[5m])) by (le,namespace,service,instance)\n) \n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} Median", + "refId": "B" + }, + { + "expr": "sum(rate(alertmanager_notification_latency_seconds_sum{namespace=\"$namespace\",service=\"$service\", integration=\"$integration\"}[5m])) by (namespace,service,instance)\n/\nsum(rate(alertmanager_notification_latency_seconds_count{namespace=\"$namespace\",service=\"$service\", integration=\"$integration\"}[5m])) by (namespace,service,instance)\n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}instance{{`}}`}} Average", + "refId": "C" + } + ], + "thresholds": [ + + ], + "timeFrom": null, + "timeShift": null, + "title": "$integration: Notification Duration", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ + + ] + }, + "yaxes": [ + { + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Notifications", + "titleSize": "h6", + "type": "row" + } + ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "alertmanager-mixin" + ], + "templating": { + "list": [ + { + "current": { + "text": "Prometheus", + "value": "Prometheus" + }, + "hide": 0, + "label": null, + "name": "datasource", + "options": [ + + ], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, + { + "allValue": null, + "current": { + "text": "", + "value": "" + }, + "datasource": "$datasource", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "namespace", + "options": [ + + ], + "query": "label_values(alertmanager_alerts, namespace)", + "refresh": 2, + "regex": "", + "sort": 1, + "tagValuesQuery": "", + "tags": [ + + ], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "text": "", + "value": "" + }, + "datasource": "$datasource", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "service", + "options": [ + + ], + "query": "label_values(alertmanager_alerts, service)", + "refresh": 2, + "regex": "", + "sort": 1, + "tagValuesQuery": "", + "tags": [ + + ], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "text": "all", + "value": "$__all" + }, + "datasource": "$datasource", + "hide": 2, + "includeAll": true, + "label": null, + "multi": false, + "name": "integration", + "options": [ + + ], + "query": "label_values(alertmanager_notifications_total{integration=~\".*\"}, integration)", + "refresh": 2, + "regex": "", + "sort": 1, + "tagValuesQuery": "", + "tags": [ + + ], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, + "time": { + "from": "now-1h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "utc", + "title": "Alertmanager / Overview", + "uid": "alertmanager-overview", + "version": 0 + } +{{- end }} \ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/rules-1.14/kube-apiserver-burnrate.rules.yaml b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/rules-1.14/kube-apiserver-burnrate.rules.yaml new file mode 100644 index 000000000..f2b8563b1 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/rules-1.14/kube-apiserver-burnrate.rules.yaml @@ -0,0 +1,328 @@ +{{- /* +Generated from 'kube-apiserver-burnrate.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml +Do not change in-place! In order to change this file first read following link: +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack +*/ -}} +{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} +{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create }} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver-burnrate.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + labels: + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} +{{- if .Values.defaultRules.labels }} +{{ toYaml .Values.defaultRules.labels | indent 4 }} +{{- end }} +{{- if .Values.defaultRules.annotations }} + annotations: +{{ toYaml .Values.defaultRules.annotations | indent 4 }} +{{- end }} +spec: + groups: + - name: kube-apiserver-burnrate.rules + rules: + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[1d])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[1d])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[1d])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[1d])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1d])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1d])) + labels: + verb: read + record: apiserver_request:burnrate1d + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[1h])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[1h])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[1h])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[1h])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1h])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1h])) + labels: + verb: read + record: apiserver_request:burnrate1h + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[2h])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[2h])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[2h])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[2h])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[2h])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[2h])) + labels: + verb: read + record: apiserver_request:burnrate2h + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30m])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[30m])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[30m])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[30m])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[30m])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[30m])) + labels: + verb: read + record: apiserver_request:burnrate30m + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[3d])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[3d])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[3d])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[3d])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[3d])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[3d])) + labels: + verb: read + record: apiserver_request:burnrate3d + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[5m])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[5m])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[5m])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[5m])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[5m])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m])) + labels: + verb: read + record: apiserver_request:burnrate5m + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[6h])) + - + ( + ( + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[6h])) + or + vector(0) + ) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[6h])) + + + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[6h])) + ) + ) + + + # errors + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[6h])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[6h])) + labels: + verb: read + record: apiserver_request:burnrate6h + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[1d])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1d])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d])) + labels: + verb: write + record: apiserver_request:burnrate1d + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[1h])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1h])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h])) + labels: + verb: write + record: apiserver_request:burnrate1h + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[2h])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[2h])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h])) + labels: + verb: write + record: apiserver_request:burnrate2h + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[30m])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[30m])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m])) + labels: + verb: write + record: apiserver_request:burnrate30m + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[3d])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[3d])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d])) + labels: + verb: write + record: apiserver_request:burnrate3d + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[5m])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[5m])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) + labels: + verb: write + record: apiserver_request:burnrate5m + - expr: |- + ( + ( + # too slow + sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h])) + - + sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[6h])) + ) + + + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[6h])) + ) + / + sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h])) + labels: + verb: write + record: apiserver_request:burnrate6h +{{- end }} \ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/rules-1.14/kube-apiserver-histogram.rules.yaml b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/rules-1.14/kube-apiserver-histogram.rules.yaml new file mode 100644 index 000000000..f5886a152 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/rules-1.14/kube-apiserver-histogram.rules.yaml @@ -0,0 +1,49 @@ +{{- /* +Generated from 'kube-apiserver-histogram.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml +Do not change in-place! In order to change this file first read following link: +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack +*/ -}} +{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} +{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create }} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver-histogram.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + labels: + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} +{{- if .Values.defaultRules.labels }} +{{ toYaml .Values.defaultRules.labels | indent 4 }} +{{- end }} +{{- if .Values.defaultRules.annotations }} + annotations: +{{ toYaml .Values.defaultRules.annotations | indent 4 }} +{{- end }} +spec: + groups: + - name: kube-apiserver-histogram.rules + rules: + - expr: histogram_quantile(0.99, sum by (cluster, le, resource) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET"}[5m]))) > 0 + labels: + quantile: '0.99' + verb: read + record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile + - expr: histogram_quantile(0.99, sum by (cluster, le, resource) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m]))) > 0 + labels: + quantile: '0.99' + verb: write + record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile + - expr: histogram_quantile(0.99, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",subresource!="log",verb!~"LIST|WATCH|WATCHLIST|DELETECOLLECTION|PROXY|CONNECT"}[5m])) without(instance, pod)) + labels: + quantile: '0.99' + record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile + - expr: histogram_quantile(0.9, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",subresource!="log",verb!~"LIST|WATCH|WATCHLIST|DELETECOLLECTION|PROXY|CONNECT"}[5m])) without(instance, pod)) + labels: + quantile: '0.9' + record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile + - expr: histogram_quantile(0.5, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",subresource!="log",verb!~"LIST|WATCH|WATCHLIST|DELETECOLLECTION|PROXY|CONNECT"}[5m])) without(instance, pod)) + labels: + quantile: '0.5' + record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile +{{- end }} \ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch index 89c47b28a..f0f6547f4 100644 --- a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch @@ -24,8 +24,8 @@ +sources: + - https://github.com/prometheus-community/helm-charts + - https://github.com/prometheus-operator/kube-prometheus -+version: 16.6.0 -+appVersion: 0.48.0 ++version: 17.0.0 ++appVersion: 0.49.0 +kubeVersion: ">=1.16.0-0" +home: https://github.com/prometheus-operator/kube-prometheus +keywords: diff --git a/packages/rancher-monitoring/generated-changes/patch/README.md.patch b/packages/rancher-monitoring/generated-changes/patch/README.md.patch index 927bd6ed9..0462842ed 100644 --- a/packages/rancher-monitoring/generated-changes/patch/README.md.patch +++ b/packages/rancher-monitoring/generated-changes/patch/README.md.patch @@ -1,6 +1,28 @@ --- charts-original/README.md +++ charts/README.md -@@ -193,7 +193,39 @@ +@@ -83,6 +83,21 @@ + + A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. + ++### From 16.x to 17.x ++Version 15 upgrades prometheus-operator from 0.48.x to 0.49.x. Helm does not automatically upgrade or install new CRDs on a chart upgrade, so you have to install the CRDs manually before updating: ++ ++```console ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml ++kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml ++``` ++ ++ + ### From 15.x to 16.x + Version 16 upgrades kube-state-metrics to v2.0.0. This includes changed command-line arguments and removed metrics, see this [blog post](https://kubernetes.io/blog/2021/04/13/kube-state-metrics-v-2-0/). This version also removes Grafana dashboards that supported Kubernetes 1.14 or earlier. + +@@ -193,7 +208,39 @@ helm show values prometheus-community/kube-prometheus-stack ``` diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-alertmanagerconfigs.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-alertmanagerconfigs.yaml.patch new file mode 100644 index 000000000..345cb8498 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-alertmanagerconfigs.yaml.patch @@ -0,0 +1,2456 @@ +--- charts-original/crds/crd-alertmanagerconfigs.yaml ++++ charts/crds/crd-alertmanagerconfigs.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -22,31 +22,44 @@ + - name: v1alpha1 + schema: + openAPIV3Schema: +- description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to be aggregated across multiple namespaces configuring one Alertmanager cluster. ++ description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to ++ be aggregated across multiple namespaces configuring one Alertmanager cluster. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: AlertmanagerConfigSpec is a specification of the desired behavior of the Alertmanager configuration. By definition, the Alertmanager configuration only applies to alerts for which the `namespace` label is equal to the namespace of the AlertmanagerConfig resource. ++ description: AlertmanagerConfigSpec is a specification of the desired ++ behavior of the Alertmanager configuration. By definition, the Alertmanager ++ configuration only applies to alerts for which the `namespace` label ++ is equal to the namespace of the AlertmanagerConfig resource. + properties: + inhibitRules: +- description: List of inhibition rules. The rules will only apply to alerts matching the resource’s namespace. ++ description: List of inhibition rules. The rules will only apply to ++ alerts matching the resource’s namespace. + items: +- description: InhibitRule defines an inhibition rule that allows to mute alerts when other alerts are already firing. See https://prometheus.io/docs/alerting/latest/configuration/#inhibit_rule ++ description: InhibitRule defines an inhibition rule that allows ++ to mute alerts when other alerts are already firing. See https://prometheus.io/docs/alerting/latest/configuration/#inhibit_rule + properties: + equal: +- description: Labels that must have an equal value in the source and target alert for the inhibition to take effect. ++ description: Labels that must have an equal value in the source ++ and target alert for the inhibition to take effect. + items: + type: string + type: array + sourceMatch: +- description: Matchers for which one or more alerts have to exist for the inhibition to take effect. The operator enforces that the alert matches the resource’s namespace. ++ description: Matchers for which one or more alerts have to exist ++ for the inhibition to take effect. The operator enforces that ++ the alert matches the resource’s namespace. + items: + description: Matcher defines how to match on alert's labels. + properties: +@@ -55,7 +68,8 @@ + minLength: 1 + type: string + regex: +- description: Whether to match on equality (false) or regular-expression (true). ++ description: Whether to match on equality (false) or regular-expression ++ (true). + type: boolean + value: + description: Label value to match. +@@ -65,7 +79,9 @@ + type: object + type: array + targetMatch: +- description: Matchers that have to be fulfilled in the alerts to be muted. The operator enforces that the alert matches the resource’s namespace. ++ description: Matchers that have to be fulfilled in the alerts ++ to be muted. The operator enforces that the alert matches ++ the resource’s namespace. + items: + description: Matcher defines how to match on alert's labels. + properties: +@@ -74,7 +90,8 @@ + minLength: 1 + type: string + regex: +- description: Whether to match on equality (false) or regular-expression (true). ++ description: Whether to match on equality (false) or regular-expression ++ (true). + type: boolean + value: + description: Label value to match. +@@ -99,31 +116,45 @@ + description: The identity to use for authentication. + type: string + authPassword: +- description: The secret's key that contains the password to use for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the password ++ to use for authentication. The secret needs to be in ++ the same namespace as the AlertmanagerConfig object ++ and accessible by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + authSecret: +- description: The secret's key that contains the CRAM-MD5 secret. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the CRAM-MD5 ++ secret. The secret needs to be in the same namespace ++ as the AlertmanagerConfig object and accessible by the ++ Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -135,7 +166,9 @@ + description: The sender address. + type: string + headers: +- description: Further headers email header key/value pairs. Overrides any headers previously set by the notification implementation. ++ description: Further headers email header key/value pairs. ++ Overrides any headers previously set by the notification ++ implementation. + items: + description: KeyValue defines a (key, value) tuple. + properties: +@@ -158,7 +191,8 @@ + description: The HTML body of the email notification. + type: string + requireTLS: +- description: The SMTP TLS requirement. Note that Go does not support unencrypted connections to remote SMTP endpoints. ++ description: The SMTP TLS requirement. Note that Go does ++ not support unencrypted connections to remote SMTP endpoints. + type: boolean + sendResolved: + description: Whether or not to notify about resolved alerts. +@@ -173,68 +207,92 @@ + description: TLS configuration + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use ++ for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use ++ for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use for ++ the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file ++ for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use ++ for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use for ++ the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key +@@ -244,16 +302,22 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -268,25 +332,34 @@ + type: object + type: array + name: +- description: Name of the receiver. Must be unique across all items from the list. ++ description: Name of the receiver. Must be unique across all ++ items from the list. + minLength: 1 + type: string + opsgenieConfigs: + description: List of OpsGenie configurations. + items: +- description: OpsGenieConfig configures notifications via OpsGenie. See https://prometheus.io/docs/alerting/latest/configuration/#opsgenie_config ++ description: OpsGenieConfig configures notifications via OpsGenie. ++ See https://prometheus.io/docs/alerting/latest/configuration/#opsgenie_config + properties: + apiKey: +- description: The secret's key that contains the OpsGenie API key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the OpsGenie ++ API key. The secret needs to be in the same namespace ++ as the AlertmanagerConfig object and accessible by the ++ Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -298,7 +371,8 @@ + description: Description of the incident. + type: string + details: +- description: A set of arbitrary key/value pairs that provide further detail about the incident. ++ description: A set of arbitrary key/value pairs that provide ++ further detail about the incident. + items: + description: KeyValue defines a (key, value) tuple. + properties: +@@ -321,47 +395,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -373,68 +468,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -444,22 +565,29 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object +@@ -470,12 +598,15 @@ + description: Additional alert note. + type: string + priority: +- description: Priority level of alert. Possible values are P1, P2, P3, P4, and P5. ++ description: Priority level of alert. Possible values ++ are P1, P2, P3, P4, and P5. + type: string + responders: + description: List of responders responsible for notifications. + items: +- description: OpsGenieConfigResponder defines a responder to an incident. One of `id`, `name` or `username` has to be defined. ++ description: OpsGenieConfigResponder defines a responder ++ to an incident. One of `id`, `name` or `username` ++ has to be defined. + properties: + id: + description: ID of the responder. +@@ -501,14 +632,16 @@ + description: Backlink to the sender of the notification. + type: string + tags: +- description: Comma separated list of tags attached to the notifications. ++ description: Comma separated list of tags attached to ++ the notifications. + type: string + type: object + type: array + pagerdutyConfigs: + description: List of PagerDuty configurations. + items: +- description: PagerDutyConfig configures notifications via PagerDuty. See https://prometheus.io/docs/alerting/latest/configuration/#pagerduty_config ++ description: PagerDutyConfig configures notifications via ++ PagerDuty. See https://prometheus.io/docs/alerting/latest/configuration/#pagerduty_config + properties: + class: + description: The class/type of the event. +@@ -520,13 +653,15 @@ + description: Backlink to the sender of notification. + type: string + component: +- description: The part or component of the affected system that is broken. ++ description: The part or component of the affected system ++ that is broken. + type: string + description: + description: Description of the incident. + type: string + details: +- description: Arbitrary key/value pairs that provide further detail about the incident. ++ description: Arbitrary key/value pairs that provide further ++ detail about the incident. + items: + description: KeyValue defines a (key, value) tuple. + properties: +@@ -552,47 +687,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -604,68 +760,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -675,36 +857,51 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object + routingKey: +- description: The secret's key that contains the PagerDuty integration key (when using Events API v2). Either this field or `serviceKey` needs to be defined. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the PagerDuty ++ integration key (when using Events API v2). Either this ++ field or `serviceKey` needs to be defined. The secret ++ needs to be in the same namespace as the AlertmanagerConfig ++ object and accessible by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -713,16 +910,25 @@ + description: Whether or not to notify about resolved alerts. + type: boolean + serviceKey: +- description: The secret's key that contains the PagerDuty service key (when using integration type "Prometheus"). Either this field or `routingKey` needs to be defined. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the PagerDuty ++ service key (when using integration type "Prometheus"). ++ Either this field or `routingKey` needs to be defined. ++ The secret needs to be in the same namespace as the ++ AlertmanagerConfig object and accessible by the Prometheus ++ Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -738,13 +944,17 @@ + pushoverConfigs: + description: List of Pushover configurations. + items: +- description: PushoverConfig configures notifications via Pushover. See https://prometheus.io/docs/alerting/latest/configuration/#pushover_config ++ description: PushoverConfig configures notifications via Pushover. ++ See https://prometheus.io/docs/alerting/latest/configuration/#pushover_config + properties: + expire: +- description: How long your notification will continue to be retried for, unless the user acknowledges the notification. ++ description: How long your notification will continue ++ to be retried for, unless the user acknowledges the ++ notification. + type: string + html: +- description: Whether notification message is HTML or plain text. ++ description: Whether notification message is HTML or plain ++ text. + type: boolean + httpConfig: + description: HTTP client configuration. +@@ -753,47 +963,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -805,68 +1036,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -876,22 +1133,29 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object +@@ -902,28 +1166,40 @@ + description: Priority, see https://pushover.net/api#priority + type: string + retry: +- description: How often the Pushover servers will send the same notification to the user. Must be at least 30 seconds. ++ description: How often the Pushover servers will send ++ the same notification to the user. Must be at least ++ 30 seconds. + type: string + sendResolved: + description: Whether or not to notify about resolved alerts. + type: boolean + sound: +- description: The name of one of the sounds supported by device clients to override the user's default sound choice ++ description: The name of one of the sounds supported by ++ device clients to override the user's default sound ++ choice + type: string + title: + description: Notification title. + type: string + token: +- description: The secret's key that contains the registered application’s API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the registered ++ application’s API token, see https://pushover.net/apps. ++ The secret needs to be in the same namespace as the ++ AlertmanagerConfig object and accessible by the Prometheus ++ Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -932,19 +1208,27 @@ + description: A supplementary URL shown alongside the message. + type: string + urlTitle: +- description: A title for supplementary URL, otherwise just the URL is shown ++ description: A title for supplementary URL, otherwise ++ just the URL is shown + type: string + userKey: +- description: The secret's key that contains the recipient user’s user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the recipient ++ user’s user key. The secret needs to be in the same ++ namespace as the AlertmanagerConfig object and accessible ++ by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -954,15 +1238,24 @@ + slackConfigs: + description: List of Slack configurations. + items: +- description: SlackConfig configures notifications via Slack. See https://prometheus.io/docs/alerting/latest/configuration/#slack_config ++ description: SlackConfig configures notifications via Slack. ++ See https://prometheus.io/docs/alerting/latest/configuration/#slack_config + properties: + actions: +- description: A list of Slack actions that are sent with each notification. ++ description: A list of Slack actions that are sent with ++ each notification. + items: +- description: SlackAction configures a single Slack action that is sent with each notification. See https://api.slack.com/docs/message-attachments#action_fields and https://api.slack.com/docs/message-buttons for more information. ++ description: SlackAction configures a single Slack action ++ that is sent with each notification. See https://api.slack.com/docs/message-attachments#action_fields ++ and https://api.slack.com/docs/message-buttons for ++ more information. + properties: + confirm: +- description: SlackConfirmationField protect users from destructive actions or particularly distinguished decisions by asking them to confirm their button click one more time. See https://api.slack.com/docs/interactive-message-field-guide#confirmation_fields for more information. ++ description: SlackConfirmationField protect users ++ from destructive actions or particularly distinguished ++ decisions by asking them to confirm their button ++ click one more time. See https://api.slack.com/docs/interactive-message-field-guide#confirmation_fields ++ for more information. + properties: + dismissText: + type: string +@@ -996,16 +1289,23 @@ + type: object + type: array + apiURL: +- description: The secret's key that contains the Slack webhook URL. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the Slack ++ webhook URL. The secret needs to be in the same namespace ++ as the AlertmanagerConfig object and accessible by the ++ Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -1013,16 +1313,24 @@ + callbackId: + type: string + channel: +- description: The channel or user to send notifications to. ++ description: The channel or user to send notifications ++ to. + type: string + color: + type: string + fallback: + type: string + fields: +- description: A list of Slack fields that are sent with each notification. ++ description: A list of Slack fields that are sent with ++ each notification. + items: +- description: SlackField configures a single Slack field that is sent with each notification. Each field must contain a title, value, and optionally, a boolean value to indicate if the field is short enough to be displayed next to other fields designated as short. See https://api.slack.com/docs/message-attachments#fields for more information. ++ description: SlackField configures a single Slack field ++ that is sent with each notification. Each field must ++ contain a title, value, and optionally, a boolean ++ value to indicate if the field is short enough to ++ be displayed next to other fields designated as short. ++ See https://api.slack.com/docs/message-attachments#fields ++ for more information. + properties: + short: + type: boolean +@@ -1046,47 +1354,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1098,68 +1427,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -1169,22 +1524,29 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object +@@ -1222,19 +1584,27 @@ + victoropsConfigs: + description: List of VictorOps configurations. + items: +- description: VictorOpsConfig configures notifications via VictorOps. See https://prometheus.io/docs/alerting/latest/configuration/#victorops_config ++ description: VictorOpsConfig configures notifications via ++ VictorOps. See https://prometheus.io/docs/alerting/latest/configuration/#victorops_config + properties: + apiKey: +- description: The secret's key that contains the API key to use when talking to the VictorOps API. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the API key ++ to use when talking to the VictorOps API. The secret ++ needs to be in the same namespace as the AlertmanagerConfig ++ object and accessible by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -1269,47 +1639,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1321,68 +1712,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -1392,30 +1809,39 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object + messageType: +- description: Describes the behavior of the alert (CRITICAL, WARNING, INFO). ++ description: Describes the behavior of the alert (CRITICAL, ++ WARNING, INFO). + type: string + monitoringTool: +- description: The monitoring tool the state message is from. ++ description: The monitoring tool the state message is ++ from. + type: string + routingKey: + description: A key used to map the alert to a team. +@@ -1424,14 +1850,16 @@ + description: Whether or not to notify about resolved alerts. + type: boolean + stateMessage: +- description: Contains long explanation of the alerted problem. ++ description: Contains long explanation of the alerted ++ problem. + type: string + type: object + type: array + webhookConfigs: + description: List of webhook configurations. + items: +- description: WebhookConfig configures notifications via a generic receiver supporting the webhook payload. See https://prometheus.io/docs/alerting/latest/configuration/#webhook_config ++ description: WebhookConfig configures notifications via a ++ generic receiver supporting the webhook payload. See https://prometheus.io/docs/alerting/latest/configuration/#webhook_config + properties: + httpConfig: + description: HTTP client configuration. +@@ -1440,47 +1868,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1492,68 +1941,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -1563,27 +2038,35 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object + maxAlerts: +- description: Maximum number of alerts to be sent per webhook message. When 0, all alerts are included. ++ description: Maximum number of alerts to be sent per webhook ++ message. When 0, all alerts are included. + format: int32 + minimum: 0 + type: integer +@@ -1591,19 +2074,30 @@ + description: Whether or not to notify about resolved alerts. + type: boolean + url: +- description: The URL to send HTTP POST requests to. `urlSecret` takes precedence over `url`. One of `urlSecret` and `url` should be defined. ++ description: The URL to send HTTP POST requests to. `urlSecret` ++ takes precedence over `url`. One of `urlSecret` and ++ `url` should be defined. + type: string + urlSecret: +- description: The secret's key that contains the webhook URL to send HTTP requests to. `urlSecret` takes precedence over `url`. One of `urlSecret` and `url` should be defined. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the webhook ++ URL to send HTTP requests to. `urlSecret` takes precedence ++ over `url`. One of `urlSecret` and `url` should be defined. ++ The secret needs to be in the same namespace as the ++ AlertmanagerConfig object and accessible by the Prometheus ++ Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -1613,21 +2107,29 @@ + wechatConfigs: + description: List of WeChat configurations. + items: +- description: WeChatConfig configures notifications via WeChat. See https://prometheus.io/docs/alerting/latest/configuration/#wechat_config ++ description: WeChatConfig configures notifications via WeChat. ++ See https://prometheus.io/docs/alerting/latest/configuration/#wechat_config + properties: + agentID: + type: string + apiSecret: +- description: The secret's key that contains the WeChat API key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the WeChat ++ API key. The secret needs to be in the same namespace ++ as the AlertmanagerConfig object and accessible by the ++ Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -1645,47 +2147,68 @@ + description: BasicAuth for the client. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor ++ namespace that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor ++ namespace that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: The secret's key that contains the bearer token to be used by the client for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. ++ description: The secret's key that contains the bearer ++ token to be used by the client for authentication. ++ The secret needs to be in the same namespace as ++ the AlertmanagerConfig object and accessible by ++ the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1697,68 +2220,94 @@ + description: TLS configuration for the client. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to ++ use for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert ++ file for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to ++ use for the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap ++ or its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use ++ for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to ++ select from. Must be a valid secret ++ key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More ++ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret ++ or its key must be defined + type: boolean + required: + - key +@@ -1768,27 +2317,35 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key ++ file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or ++ its key must be defined + type: boolean + required: + - key + type: object + serverName: +- description: Used to verify the hostname for the targets. ++ description: Used to verify the hostname for the ++ targets. + type: string + type: object + type: object + message: +- description: API request data as defined by the WeChat API. ++ description: API request data as defined by the WeChat ++ API. + type: string + messageType: + type: string +@@ -1808,10 +2365,14 @@ + type: object + type: array + route: +- description: The Alertmanager route definition for alerts matching the resource’s namespace. If present, it will be added to the generated Alertmanager configuration as a first-level route. ++ description: The Alertmanager route definition for alerts matching ++ the resource’s namespace. If present, it will be added to the generated ++ Alertmanager configuration as a first-level route. + properties: + continue: +- description: Boolean indicating whether an alert should continue matching subsequent sibling nodes. It will always be overridden to true for the first-level route by the Prometheus operator. ++ description: Boolean indicating whether an alert should continue ++ matching subsequent sibling nodes. It will always be overridden ++ to true for the first-level route by the Prometheus operator. + type: boolean + groupBy: + description: List of labels to group by. +@@ -1819,13 +2380,20 @@ + type: string + type: array + groupInterval: +- description: How long to wait before sending an updated notification. Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds seconds minutes hours). ++ description: How long to wait before sending an updated notification. ++ Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds ++ seconds minutes hours). + type: string + groupWait: +- description: How long to wait before sending the initial notification. Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds seconds minutes hours). ++ description: How long to wait before sending the initial notification. ++ Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds ++ seconds minutes hours). + type: string + matchers: +- description: 'List of matchers that the alert’s labels should match. For the first level route, the operator removes any existing equality and regexp matcher on the `namespace` label and adds a `namespace: ` matcher.' ++ description: 'List of matchers that the alert’s labels should ++ match. For the first level route, the operator removes any existing ++ equality and regexp matcher on the `namespace` label and adds ++ a `namespace: ` matcher.' + items: + description: Matcher defines how to match on alert's labels. + properties: +@@ -1834,7 +2402,8 @@ + minLength: 1 + type: string + regex: +- description: Whether to match on equality (false) or regular-expression (true). ++ description: Whether to match on equality (false) or regular-expression ++ (true). + type: boolean + value: + description: Label value to match. +@@ -1844,10 +2413,13 @@ + type: object + type: array + receiver: +- description: Name of the receiver for this route. If not empty, it should be listed in the `receivers` field. ++ description: Name of the receiver for this route. If not empty, ++ it should be listed in the `receivers` field. + type: string + repeatInterval: +- description: How long to wait before repeating the last notification. Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds seconds minutes hours). ++ description: How long to wait before repeating the last notification. ++ Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds ++ seconds minutes hours). + type: string + routes: + description: Child routes. diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-alertmanagers.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-alertmanagers.yaml.patch new file mode 100644 index 000000000..dfccdeec3 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-alertmanagers.yaml.patch @@ -0,0 +1,5264 @@ +--- charts-original/crds/crd-alertmanagers.yaml ++++ charts/crds/crd-alertmanagers.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -37,18 +37,24 @@ + description: Alertmanager describes an Alertmanager cluster. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: 'Specification of the desired behavior of the Alertmanager cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' ++ description: 'Specification of the desired behavior of the Alertmanager ++ cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + properties: + additionalPeers: +- description: AdditionalPeers allows injecting a set of additional Alertmanagers to peer with to form a highly available cluster. ++ description: AdditionalPeers allows injecting a set of additional ++ Alertmanagers to peer with to form a highly available cluster. + items: + type: string + type: array +@@ -56,29 +62,59 @@ + description: If specified, the pod's scheduling constraints. + properties: + nodeAffinity: +- description: Describes node affinity scheduling rules for the pod. ++ description: Describes node affinity scheduling rules for the ++ pod. + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the affinity expressions specified by ++ this field, but it may choose a node that violates one or ++ more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node matches ++ the corresponding matchExpressions; the node(s) with the ++ highest sum are the most preferred. + items: +- description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op). ++ description: An empty preferred scheduling term matches ++ all objects with implicit weight 0 (i.e. it's a no-op). ++ A null preferred scheduling term matches no objects (i.e. ++ is also a no-op). + properties: + preference: +- description: A node selector term, associated with the corresponding weight. ++ description: A node selector term, associated with the ++ corresponding weight. + properties: + matchExpressions: +- description: A list of node selector requirements by node's labels. ++ description: A list of node selector requirements ++ by node's labels. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -88,18 +124,33 @@ + type: object + type: array + matchFields: +- description: A list of node selector requirements by node's fields. ++ description: A list of node selector requirements ++ by node's fields. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -110,7 +161,8 @@ + type: array + type: object + weight: +- description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. ++ description: Weight associated with matching the corresponding ++ nodeSelectorTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -119,26 +171,50 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node. ++ description: If the affinity requirements specified by this ++ field are not met at scheduling time, the pod will not be ++ scheduled onto the node. If the affinity requirements specified ++ by this field cease to be met at some point during pod execution ++ (e.g. due to an update), the system may or may not try to ++ eventually evict the pod from its node. + properties: + nodeSelectorTerms: +- description: Required. A list of node selector terms. The terms are ORed. ++ description: Required. A list of node selector terms. ++ The terms are ORed. + items: +- description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm. ++ description: A null or empty node selector term matches ++ no objects. The requirements of them are ANDed. The ++ TopologySelectorTerm type implements a subset of the ++ NodeSelectorTerm. + properties: + matchExpressions: +- description: A list of node selector requirements by node's labels. ++ description: A list of node selector requirements ++ by node's labels. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -148,18 +224,33 @@ + type: object + type: array + matchFields: +- description: A list of node selector requirements by node's fields. ++ description: A list of node selector requirements ++ by node's fields. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -175,32 +266,61 @@ + type: object + type: object + podAffinity: +- description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)). ++ description: Describes pod affinity scheduling rules (e.g. co-locate ++ this pod in the same node, zone, etc. as some other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the affinity expressions specified by ++ this field, but it may choose a node that violates one or ++ more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node has ++ pods which matches the corresponding podAffinityTerm; the ++ node(s) with the highest sum are the most preferred. + items: +- description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s) ++ description: The weights of all of the matched WeightedPodAffinityTerm ++ fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: +- description: Required. A pod affinity term, associated with the corresponding weight. ++ description: Required. A pod affinity term, associated ++ with the corresponding weight. + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ++ ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement ++ is a selector that contains values, a key, ++ and an operator that relates the key and ++ values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that ++ the selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's ++ relationship to a set of values. Valid ++ operators are In, NotIn, Exists and ++ DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, ++ the values array must be empty. This ++ array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -212,22 +332,36 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is ++ "In", and the values array contains only "value". ++ The requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces ++ the labelSelector applies to (matches against); ++ null or empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods ++ matching the labelSelector in the specified namespaces, ++ where co-located is defined as running on a node ++ whose value of the label with key topologyKey ++ matches that of any node on which any of the selected ++ pods is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + weight: +- description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. ++ description: weight associated with matching the corresponding ++ podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -236,26 +370,52 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied. ++ description: If the affinity requirements specified by this ++ field are not met at scheduling time, the pod will not be ++ scheduled onto the node. If the affinity requirements specified ++ by this field cease to be met at some point during pod execution ++ (e.g. due to a pod label update), the system may or may ++ not try to eventually evict the pod from its node. When ++ there are multiple elements, the lists of nodes corresponding ++ to each podAffinityTerm are intersected, i.e. all terms ++ must be satisfied. + items: +- description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running ++ description: Defines a set of pods (namely those matching ++ the labelSelector relative to the given namespace(s)) ++ that this pod should be co-located (affinity) or not co-located ++ (anti-affinity) with, where co-located is defined as running ++ on a node whose value of the label with key ++ matches that of any node on which a pod of the set of ++ pods is running + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the ++ selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. If the ++ operator is Exists or DoesNotExist, the ++ values array must be empty. This array is ++ replaced during a strategic merge patch. + items: + type: string + type: array +@@ -267,16 +427,29 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is "In", ++ and the values array contains only "value". The ++ requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces the ++ labelSelector applies to (matches against); null or ++ empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods matching ++ the labelSelector in the specified namespaces, where ++ co-located is defined as running on a node whose value ++ of the label with key topologyKey matches that of ++ any node on which any of the selected pods is running. ++ Empty topologyKey is not allowed. + type: string + required: + - topologyKey +@@ -284,32 +457,62 @@ + type: array + type: object + podAntiAffinity: +- description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)). ++ description: Describes pod anti-affinity scheduling rules (e.g. ++ avoid putting this pod in the same node, zone, etc. as some ++ other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the anti-affinity expressions specified ++ by this field, but it may choose a node that violates one ++ or more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling anti-affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node has ++ pods which matches the corresponding podAffinityTerm; the ++ node(s) with the highest sum are the most preferred. + items: +- description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s) ++ description: The weights of all of the matched WeightedPodAffinityTerm ++ fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: +- description: Required. A pod affinity term, associated with the corresponding weight. ++ description: Required. A pod affinity term, associated ++ with the corresponding weight. + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ++ ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement ++ is a selector that contains values, a key, ++ and an operator that relates the key and ++ values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that ++ the selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's ++ relationship to a set of values. Valid ++ operators are In, NotIn, Exists and ++ DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, ++ the values array must be empty. This ++ array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -321,22 +524,36 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is ++ "In", and the values array contains only "value". ++ The requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces ++ the labelSelector applies to (matches against); ++ null or empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods ++ matching the labelSelector in the specified namespaces, ++ where co-located is defined as running on a node ++ whose value of the label with key topologyKey ++ matches that of any node on which any of the selected ++ pods is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + weight: +- description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. ++ description: weight associated with matching the corresponding ++ podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -345,26 +562,52 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied. ++ description: If the anti-affinity requirements specified by ++ this field are not met at scheduling time, the pod will ++ not be scheduled onto the node. If the anti-affinity requirements ++ specified by this field cease to be met at some point during ++ pod execution (e.g. due to a pod label update), the system ++ may or may not try to eventually evict the pod from its ++ node. When there are multiple elements, the lists of nodes ++ corresponding to each podAffinityTerm are intersected, i.e. ++ all terms must be satisfied. + items: +- description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running ++ description: Defines a set of pods (namely those matching ++ the labelSelector relative to the given namespace(s)) ++ that this pod should be co-located (affinity) or not co-located ++ (anti-affinity) with, where co-located is defined as running ++ on a node whose value of the label with key ++ matches that of any node on which a pod of the set of ++ pods is running + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the ++ selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. If the ++ operator is Exists or DoesNotExist, the ++ values array must be empty. This array is ++ replaced during a strategic merge patch. + items: + type: string + type: array +@@ -376,16 +619,29 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is "In", ++ and the values array contains only "value". The ++ requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces the ++ labelSelector applies to (matches against); null or ++ empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods matching ++ the labelSelector in the specified namespaces, where ++ co-located is defined as running on a node whose value ++ of the label with key topologyKey matches that of ++ any node on which any of the selected pods is running. ++ Empty topologyKey is not allowed. + type: string + required: + - topologyKey +@@ -394,21 +650,32 @@ + type: object + type: object + alertmanagerConfigNamespaceSelector: +- description: Namespaces to be selected for AlertmanagerConfig discovery. If nil, only check own namespace. ++ description: Namespaces to be selected for AlertmanagerConfig discovery. ++ If nil, only check own namespace. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -420,25 +687,40 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + alertmanagerConfigSelector: +- description: AlertmanagerConfigs to be selected for to merge and configure Alertmanager with. ++ description: AlertmanagerConfigs to be selected for to merge and configure ++ Alertmanager with. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -450,14 +732,21 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + baseImage: +- description: 'Base image that is used to deploy pods, without tag. Deprecated: use ''image'' instead' ++ description: 'Base image that is used to deploy pods, without tag. ++ Deprecated: use ''image'' instead' + type: string + clusterAdvertiseAddress: +- description: 'ClusterAdvertiseAddress is the explicit address to advertise in cluster. Needs to be provided for non RFC1918 [1] (public) addresses. [1] RFC1918: https://tools.ietf.org/html/rfc1918' ++ description: 'ClusterAdvertiseAddress is the explicit address to advertise ++ in cluster. Needs to be provided for non RFC1918 [1] (public) addresses. ++ [1] RFC1918: https://tools.ietf.org/html/rfc1918' + type: string + clusterGossipInterval: + description: Interval between gossip attempts. +@@ -469,41 +758,79 @@ + description: Interval between pushpull attempts. + type: string + configMaps: +- description: ConfigMaps is a list of ConfigMaps in the same namespace as the Alertmanager object, which shall be mounted into the Alertmanager Pods. The ConfigMaps are mounted into /etc/alertmanager/configmaps/. ++ description: ConfigMaps is a list of ConfigMaps in the same namespace ++ as the Alertmanager object, which shall be mounted into the Alertmanager ++ Pods. The ConfigMaps are mounted into /etc/alertmanager/configmaps/. + items: + type: string + type: array + configSecret: +- description: ConfigSecret is the name of a Kubernetes Secret in the same namespace as the Alertmanager object, which contains configuration for this Alertmanager instance. Defaults to 'alertmanager-' The secret is mounted into /etc/alertmanager/config. ++ description: ConfigSecret is the name of a Kubernetes Secret in the ++ same namespace as the Alertmanager object, which contains configuration ++ for this Alertmanager instance. Defaults to 'alertmanager-' ++ The secret is mounted into /etc/alertmanager/config. + type: string + containers: +- description: 'Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to an Alertmanager pod. Containers described here modify an operator generated container if they share the same name and modifications are done via a strategic merge patch. The current container names are: `alertmanager` and `config-reloader`. Overriding containers is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice.' ++ description: 'Containers allows injecting additional containers. This ++ is meant to allow adding an authentication proxy to an Alertmanager ++ pod. Containers described here modify an operator generated container ++ if they share the same name and modifications are done via a strategic ++ merge patch. The current container names are: `alertmanager` and ++ `config-reloader`. Overriding containers is entirely outside the ++ scope of what the maintainers will support and by doing so, you ++ accept that this behaviour may break at any time without notice.' + items: +- description: A single application container that you want to run within a pod. ++ description: A single application container that you want to run ++ within a pod. + properties: + args: +- description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Arguments to the entrypoint. The docker image''s ++ CMD is used if this is not provided. Variable references $(VAR_NAME) ++ are expanded using the container''s environment. If a variable ++ cannot be resolved, the reference in the input string will ++ be unchanged. The $(VAR_NAME) syntax can be escaped with a ++ double $$, ie: $$(VAR_NAME). Escaped references will never ++ be expanded, regardless of whether the variable exists or ++ not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + command: +- description: 'Entrypoint array. Not executed within a shell. The docker image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Entrypoint array. Not executed within a shell. ++ The docker image''s ENTRYPOINT is used if this is not provided. ++ Variable references $(VAR_NAME) are expanded using the container''s ++ environment. If a variable cannot be resolved, the reference ++ in the input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether the ++ variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + env: +- description: List of environment variables to set in the container. Cannot be updated. ++ description: List of environment variables to set in the container. ++ Cannot be updated. + items: +- description: EnvVar represents an environment variable present in a Container. ++ description: EnvVar represents an environment variable present ++ in a Container. + properties: + name: +- description: Name of the environment variable. Must be a C_IDENTIFIER. ++ description: Name of the environment variable. Must be ++ a C_IDENTIFIER. + type: string + value: +- description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' ++ description: 'Variable references $(VAR_NAME) are expanded ++ using the previous defined environment variables in ++ the container and any service environment variables. ++ If a variable cannot be resolved, the reference in the ++ input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether ++ the variable exists or not. Defaults to "".' + type: string + valueFrom: +- description: Source for the environment variable's value. Cannot be used if value is not empty. ++ description: Source for the environment variable's value. ++ Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. +@@ -512,37 +839,52 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + fieldRef: +- description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' ++ description: 'Selects a field of the pod: supports ++ metadata.name, metadata.namespace, metadata.labels, ++ metadata.annotations, spec.nodeName, spec.serviceAccountName, ++ status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, limits.ephemeral-storage, requests.cpu, ++ requests.memory and requests.ephemeral-storage) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -552,16 +894,22 @@ + - resource + type: object + secretKeyRef: +- description: Selects a key of a secret in the pod's namespace ++ description: Selects a key of a secret in the pod's ++ namespace + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -572,28 +920,41 @@ + type: object + type: array + envFrom: +- description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated. ++ description: List of sources to populate environment variables ++ in the container. The keys defined within a source must be ++ a C_IDENTIFIER. All invalid keys will be reported as an event ++ when the container is starting. When a key exists in multiple ++ sources, the value associated with the last source will take ++ precedence. Values defined by an Env with a duplicate key ++ will take precedence. Cannot be updated. + items: +- description: EnvFromSource represents the source of a set of ConfigMaps ++ description: EnvFromSource represents the source of a set ++ of ConfigMaps + properties: + configMapRef: + description: The ConfigMap to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap must be defined ++ description: Specify whether the ConfigMap must be ++ defined + type: boolean + type: object + prefix: +- description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. ++ description: An optional identifier to prepend to each ++ key in the ConfigMap. Must be a C_IDENTIFIER. + type: string + secretRef: + description: The Secret to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: + description: Specify whether the Secret must be defined +@@ -602,22 +963,41 @@ + type: object + type: array + image: +- description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' ++ description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images ++ This field is optional to allow higher level config management ++ to default or override container images in workload controllers ++ like Deployments and StatefulSets.' + type: string + imagePullPolicy: +- description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' ++ description: 'Image pull policy. One of Always, Never, IfNotPresent. ++ Defaults to Always if :latest tag is specified, or IfNotPresent ++ otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' + type: string + lifecycle: +- description: Actions that the management system should take in response to container lifecycle events. Cannot be updated. ++ description: Actions that the management system should take ++ in response to container lifecycle events. Cannot be updated. + properties: + postStart: +- description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PostStart is called immediately after a container ++ is created. If the handler fails, the container is terminated ++ and restarted according to its restart policy. 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: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -626,12 +1006,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -651,38 +1035,66 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + type: object + preStop: +- description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The reason for termination is passed to the handler. The Pod''s termination grace period countdown begins before the PreStop hooked is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period. Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PreStop is called immediately before a container ++ is terminated due to an API request or management event ++ such as liveness/startup probe failure, preemption, resource ++ contention, etc. The handler is not called if the container ++ crashes or exits. The reason for termination is passed ++ to the handler. The Pod''s termination grace period countdown ++ begins before the PreStop hooked is executed. Regardless ++ of the outcome of the handler, the container will eventually ++ terminate within the Pod''s termination grace period. ++ Other management of the container blocks until the hook ++ completes or until the termination grace period is reached. ++ More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -691,12 +1103,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -716,25 +1132,33 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port +@@ -742,31 +1166,47 @@ + type: object + type: object + livenessProbe: +- description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container liveness. Container ++ will be restarted if the probe fails. Cannot be updated. More ++ info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -786,71 +1226,104 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + name: +- description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated. ++ description: Name of the container specified as a DNS_LABEL. ++ Each container in a pod must have a unique name (DNS_LABEL). ++ Cannot be updated. + type: string + ports: +- description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. ++ description: List of ports to expose from the container. Exposing ++ a port here gives the system additional information about ++ the network connections a container uses, but is primarily ++ informational. Not specifying a port here DOES NOT prevent ++ that port from being exposed. Any port which is listening ++ on the default "0.0.0.0" address inside a container will be ++ accessible from the network. Cannot be updated. + items: +- description: ContainerPort represents a network port in a single container. ++ description: ContainerPort represents a network port in a ++ single container. + properties: + containerPort: +- description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536. ++ description: Number of port to expose on the pod's IP ++ address. This must be a valid port number, 0 < x < 65536. + format: int32 + type: integer + hostIP: + description: What host IP to bind the external port to. + type: string + hostPort: +- description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. ++ description: Number of port to expose on the host. If ++ specified, this must be a valid port number, 0 < x < ++ 65536. If HostNetwork is specified, this must match ++ ContainerPort. Most containers do not need this. + format: int32 + type: integer + name: +- description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. ++ description: If specified, this must be an IANA_SVC_NAME ++ and unique within the pod. Each named port in a pod ++ must have a unique name. Name for the port that can ++ be referred to by services. + type: string + protocol: + default: TCP +- description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP". ++ description: Protocol for port. Must be UDP, TCP, or SCTP. ++ Defaults to "TCP". + type: string + required: + - containerPort +@@ -861,31 +1334,47 @@ + - protocol + x-kubernetes-list-type: map + readinessProbe: +- description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container service readiness. ++ Container will be removed from service endpoints if the probe ++ fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -905,48 +1394,65 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + resources: +- description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Compute Resources required by this container. ++ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + properties: + limits: + additionalProperties: +@@ -955,7 +1461,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -964,107 +1471,187 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, ++ otherwise to an implementation-defined value. More info: ++ https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + securityContext: +- description: 'Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' ++ description: 'Security options the pod should run with. More ++ info: https://kubernetes.io/docs/concepts/policy/security-context/ ++ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' + properties: + allowPrivilegeEscalation: +- description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN' ++ description: 'AllowPrivilegeEscalation controls whether ++ a process can gain more privileges than its parent process. ++ This bool directly controls if the no_new_privs flag will ++ be set on the container process. AllowPrivilegeEscalation ++ is true always when the container is: 1) run as Privileged ++ 2) has CAP_SYS_ADMIN' + type: boolean + capabilities: +- description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. ++ description: The capabilities to add/drop when running containers. ++ Defaults to the default set of capabilities granted by ++ the container runtime. + properties: + add: + description: Added capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + drop: + description: Removed capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + type: object + privileged: +- description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. ++ description: Run container in privileged mode. Processes ++ in privileged containers are essentially equivalent to ++ root on the host. Defaults to false. + type: boolean + procMount: +- description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. ++ description: procMount denotes the type of proc mount to ++ use for the containers. The default is DefaultProcMount ++ which uses the container runtime defaults for readonly ++ paths and masked paths. This requires the ProcMountType ++ feature flag to be enabled. + type: string + readOnlyRootFilesystem: +- description: Whether this container has a read-only root filesystem. Default is false. ++ description: Whether this container has a read-only root ++ filesystem. Default is false. + type: boolean + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The GID to run the entrypoint of the container ++ process. Uses runtime default if unset. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a ++ non-root user. If true, the Kubelet will validate the ++ image at runtime to ensure that it does not run as UID ++ 0 (root) and fail to start the container if it does. If ++ unset or false, no such validation will be performed. ++ May also be set in PodSecurityContext. If set in both ++ SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UID to run the entrypoint of the container ++ process. Defaults to user specified in image metadata ++ if unspecified. May also be set in PodSecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The SELinux context to be applied to the container. ++ If unspecified, the container runtime will allocate a ++ random SELinux context for each container. May also be ++ set in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies ++ to the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies ++ to the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies ++ to the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies ++ to the container. + type: string + type: object + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all ++ containers. If unspecified, the options from the PodSecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named ++ by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the ++ GMSA credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + type: string + type: object + type: object + startupProbe: +- description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. This is a beta feature enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'StartupProbe indicates that the Pod has successfully ++ initialized. If specified, no other probes are executed until ++ this completes successfully. If this probe fails, the Pod ++ will be restarted, just as if the livenessProbe failed. This ++ can be used to provide different probe parameters at the beginning ++ of a Pod''s lifecycle, when it might take a long time to load ++ data or warm a cache, than during steady-state operation. ++ This cannot be updated. This is a beta feature enabled by ++ the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1084,71 +1671,117 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + stdin: +- description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false. ++ description: Whether this container should allocate a buffer ++ for stdin in the container runtime. If this is not set, reads ++ from stdin in the container will always result in EOF. Default ++ is false. + type: boolean + stdinOnce: +- description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false ++ description: Whether the container runtime should close the ++ stdin channel after it has been opened by a single attach. ++ When stdin is true the stdin stream will remain open across ++ multiple attach sessions. If stdinOnce is set to true, stdin ++ is opened on container start, is empty until the first client ++ attaches to stdin, and then remains open and accepts data ++ until the client disconnects, at which time stdin is closed ++ and remains closed until the container is restarted. If this ++ flag is false, a container processes that reads from stdin ++ will never receive an EOF. Default is false + type: boolean + terminationMessagePath: +- description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.' ++ description: 'Optional: Path at which the file to which the ++ container''s termination message will be written is mounted ++ into the container''s filesystem. Message written is intended ++ to be brief final status, such as an assertion failure message. ++ Will be truncated by the node if greater than 4096 bytes. ++ The total message length across all containers will be limited ++ to 12kb. Defaults to /dev/termination-log. Cannot be updated.' + type: string + terminationMessagePolicy: +- description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated. ++ description: Indicate how the termination message should be ++ populated. File will use the contents of terminationMessagePath ++ to populate the container status message on both success and ++ failure. FallbackToLogsOnError will use the last chunk of ++ container log output if the termination message file is empty ++ and the container exited with an error. The log output is ++ limited to 2048 bytes or 80 lines, whichever is smaller. Defaults ++ to File. Cannot be updated. + type: string + tty: +- description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false. ++ description: Whether this container should allocate a TTY for ++ itself, also requires 'stdin' to be true. Default is false. + type: boolean + volumeDevices: +- description: volumeDevices is the list of block devices to be used by the container. ++ description: volumeDevices is the list of block devices to be ++ used by the container. + items: +- description: volumeDevice describes a mapping of a raw block device within a container. ++ description: volumeDevice describes a mapping of a raw block ++ device within a container. + properties: + devicePath: +- description: devicePath is the path inside of the container that the device will be mapped to. ++ description: devicePath is the path inside of the container ++ that the device will be mapped to. + type: string + name: +- description: name must match the name of a persistentVolumeClaim in the pod ++ description: name must match the name of a persistentVolumeClaim ++ in the pod + type: string + required: + - devicePath +@@ -1156,27 +1789,40 @@ + type: object + type: array + volumeMounts: +- description: Pod volumes to mount into the container's filesystem. Cannot be updated. ++ description: Pod volumes to mount into the container's filesystem. ++ Cannot be updated. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume ++ within a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume ++ should be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are ++ propagated from the host to container and the other ++ way around. When not set, MountPropagationNone is used. ++ This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which ++ the container's volume should be mounted. Behaves similarly ++ to SubPath but environment variable references $(VAR_NAME) ++ are expanded using the container's environment. Defaults ++ to "" (volume's root). SubPathExpr and SubPath are mutually ++ exclusive. + type: string + required: + - mountPath +@@ -1184,59 +1830,107 @@ + type: object + type: array + workingDir: +- description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated. ++ description: Container's working directory. If not specified, ++ the container runtime's default will be used, which might ++ be configured in the container image. Cannot be updated. + type: string + required: + - name + type: object + type: array + externalUrl: +- description: The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. ++ description: The external URL the Alertmanager instances will be available ++ under. This is necessary to generate correct URLs. This is necessary ++ if Alertmanager is not served from root of a DNS name. + type: string + forceEnableClusterMode: +- description: ForceEnableClusterMode ensures Alertmanager does not deactivate the cluster mode when running with a single replica. Use case is e.g. spanning an Alertmanager cluster across Kubernetes clusters with a single replica in each. ++ description: ForceEnableClusterMode ensures Alertmanager does not ++ deactivate the cluster mode when running with a single replica. ++ Use case is e.g. spanning an Alertmanager cluster across Kubernetes ++ clusters with a single replica in each. + type: boolean + image: +- description: Image if specified has precedence over baseImage, tag and sha combinations. Specifying the version is still necessary to ensure the Prometheus Operator knows what version of Alertmanager is being configured. ++ description: Image if specified has precedence over baseImage, tag ++ and sha combinations. Specifying the version is still necessary ++ to ensure the Prometheus Operator knows what version of Alertmanager ++ is being configured. + type: string + imagePullSecrets: +- description: An optional list of references to secrets in the same namespace to use for pulling prometheus and alertmanager images from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod ++ description: An optional list of references to secrets in the same ++ namespace to use for pulling prometheus and alertmanager images ++ from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod + items: +- description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace. ++ description: LocalObjectReference contains enough information to ++ let you locate the referenced object inside the same namespace. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + type: array + initContainers: +- description: 'InitContainers allows adding initContainers to the pod definition. Those can be used to e.g. fetch secrets for injection into the Alertmanager configuration from external sources. Any errors during the execution of an initContainer will lead to a restart of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ Using initContainers for any use case other then secret fetching is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice.' ++ description: 'InitContainers allows adding initContainers to the pod ++ definition. Those can be used to e.g. fetch secrets for injection ++ into the Alertmanager configuration from external sources. Any errors ++ during the execution of an initContainer will lead to a restart ++ of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ++ Using initContainers for any use case other then secret fetching ++ is entirely outside the scope of what the maintainers will support ++ and by doing so, you accept that this behaviour may break at any ++ time without notice.' + items: +- description: A single application container that you want to run within a pod. ++ description: A single application container that you want to run ++ within a pod. + properties: + args: +- description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Arguments to the entrypoint. The docker image''s ++ CMD is used if this is not provided. Variable references $(VAR_NAME) ++ are expanded using the container''s environment. If a variable ++ cannot be resolved, the reference in the input string will ++ be unchanged. The $(VAR_NAME) syntax can be escaped with a ++ double $$, ie: $$(VAR_NAME). Escaped references will never ++ be expanded, regardless of whether the variable exists or ++ not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + command: +- description: 'Entrypoint array. Not executed within a shell. The docker image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Entrypoint array. Not executed within a shell. ++ The docker image''s ENTRYPOINT is used if this is not provided. ++ Variable references $(VAR_NAME) are expanded using the container''s ++ environment. If a variable cannot be resolved, the reference ++ in the input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether the ++ variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + env: +- description: List of environment variables to set in the container. Cannot be updated. ++ description: List of environment variables to set in the container. ++ Cannot be updated. + items: +- description: EnvVar represents an environment variable present in a Container. ++ description: EnvVar represents an environment variable present ++ in a Container. + properties: + name: +- description: Name of the environment variable. Must be a C_IDENTIFIER. ++ description: Name of the environment variable. Must be ++ a C_IDENTIFIER. + type: string + value: +- description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' ++ description: 'Variable references $(VAR_NAME) are expanded ++ using the previous defined environment variables in ++ the container and any service environment variables. ++ If a variable cannot be resolved, the reference in the ++ input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether ++ the variable exists or not. Defaults to "".' + type: string + valueFrom: +- description: Source for the environment variable's value. Cannot be used if value is not empty. ++ description: Source for the environment variable's value. ++ Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. +@@ -1245,37 +1939,52 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + fieldRef: +- description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' ++ description: 'Selects a field of the pod: supports ++ metadata.name, metadata.namespace, metadata.labels, ++ metadata.annotations, spec.nodeName, spec.serviceAccountName, ++ status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, limits.ephemeral-storage, requests.cpu, ++ requests.memory and requests.ephemeral-storage) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -1285,16 +1994,22 @@ + - resource + type: object + secretKeyRef: +- description: Selects a key of a secret in the pod's namespace ++ description: Selects a key of a secret in the pod's ++ namespace + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1305,28 +2020,41 @@ + type: object + type: array + envFrom: +- description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated. ++ description: List of sources to populate environment variables ++ in the container. The keys defined within a source must be ++ a C_IDENTIFIER. All invalid keys will be reported as an event ++ when the container is starting. When a key exists in multiple ++ sources, the value associated with the last source will take ++ precedence. Values defined by an Env with a duplicate key ++ will take precedence. Cannot be updated. + items: +- description: EnvFromSource represents the source of a set of ConfigMaps ++ description: EnvFromSource represents the source of a set ++ of ConfigMaps + properties: + configMapRef: + description: The ConfigMap to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap must be defined ++ description: Specify whether the ConfigMap must be ++ defined + type: boolean + type: object + prefix: +- description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. ++ description: An optional identifier to prepend to each ++ key in the ConfigMap. Must be a C_IDENTIFIER. + type: string + secretRef: + description: The Secret to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: + description: Specify whether the Secret must be defined +@@ -1335,22 +2063,41 @@ + type: object + type: array + image: +- description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' ++ description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images ++ This field is optional to allow higher level config management ++ to default or override container images in workload controllers ++ like Deployments and StatefulSets.' + type: string + imagePullPolicy: +- description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' ++ description: 'Image pull policy. One of Always, Never, IfNotPresent. ++ Defaults to Always if :latest tag is specified, or IfNotPresent ++ otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' + type: string + lifecycle: +- description: Actions that the management system should take in response to container lifecycle events. Cannot be updated. ++ description: Actions that the management system should take ++ in response to container lifecycle events. Cannot be updated. + properties: + postStart: +- description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PostStart is called immediately after a container ++ is created. If the handler fails, the container is terminated ++ and restarted according to its restart policy. 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: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -1359,12 +2106,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1384,38 +2135,66 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + type: object + preStop: +- description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The reason for termination is passed to the handler. The Pod''s termination grace period countdown begins before the PreStop hooked is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period. Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PreStop is called immediately before a container ++ is terminated due to an API request or management event ++ such as liveness/startup probe failure, preemption, resource ++ contention, etc. The handler is not called if the container ++ crashes or exits. The reason for termination is passed ++ to the handler. The Pod''s termination grace period countdown ++ begins before the PreStop hooked is executed. Regardless ++ of the outcome of the handler, the container will eventually ++ terminate within the Pod''s termination grace period. ++ Other management of the container blocks until the hook ++ completes or until the termination grace period is reached. ++ More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -1424,12 +2203,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1449,25 +2232,33 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port +@@ -1475,31 +2266,47 @@ + type: object + type: object + livenessProbe: +- description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container liveness. Container ++ will be restarted if the probe fails. Cannot be updated. More ++ info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1519,71 +2326,104 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + name: +- description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated. ++ description: Name of the container specified as a DNS_LABEL. ++ Each container in a pod must have a unique name (DNS_LABEL). ++ Cannot be updated. + type: string + ports: +- description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. ++ description: List of ports to expose from the container. Exposing ++ a port here gives the system additional information about ++ the network connections a container uses, but is primarily ++ informational. Not specifying a port here DOES NOT prevent ++ that port from being exposed. Any port which is listening ++ on the default "0.0.0.0" address inside a container will be ++ accessible from the network. Cannot be updated. + items: +- description: ContainerPort represents a network port in a single container. ++ description: ContainerPort represents a network port in a ++ single container. + properties: + containerPort: +- description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536. ++ description: Number of port to expose on the pod's IP ++ address. This must be a valid port number, 0 < x < 65536. + format: int32 + type: integer + hostIP: + description: What host IP to bind the external port to. + type: string + hostPort: +- description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. ++ description: Number of port to expose on the host. If ++ specified, this must be a valid port number, 0 < x < ++ 65536. If HostNetwork is specified, this must match ++ ContainerPort. Most containers do not need this. + format: int32 + type: integer + name: +- description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. ++ description: If specified, this must be an IANA_SVC_NAME ++ and unique within the pod. Each named port in a pod ++ must have a unique name. Name for the port that can ++ be referred to by services. + type: string + protocol: + default: TCP +- description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP". ++ description: Protocol for port. Must be UDP, TCP, or SCTP. ++ Defaults to "TCP". + type: string + required: + - containerPort +@@ -1594,31 +2434,47 @@ + - protocol + x-kubernetes-list-type: map + readinessProbe: +- description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container service readiness. ++ Container will be removed from service endpoints if the probe ++ fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1638,48 +2494,65 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + resources: +- description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Compute Resources required by this container. ++ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + properties: + limits: + additionalProperties: +@@ -1688,7 +2561,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -1697,107 +2571,187 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, ++ otherwise to an implementation-defined value. More info: ++ https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + securityContext: +- description: 'Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' ++ description: 'Security options the pod should run with. More ++ info: https://kubernetes.io/docs/concepts/policy/security-context/ ++ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' + properties: + allowPrivilegeEscalation: +- description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN' ++ description: 'AllowPrivilegeEscalation controls whether ++ a process can gain more privileges than its parent process. ++ This bool directly controls if the no_new_privs flag will ++ be set on the container process. AllowPrivilegeEscalation ++ is true always when the container is: 1) run as Privileged ++ 2) has CAP_SYS_ADMIN' + type: boolean + capabilities: +- description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. ++ description: The capabilities to add/drop when running containers. ++ Defaults to the default set of capabilities granted by ++ the container runtime. + properties: + add: + description: Added capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + drop: + description: Removed capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + type: object + privileged: +- description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. ++ description: Run container in privileged mode. Processes ++ in privileged containers are essentially equivalent to ++ root on the host. Defaults to false. + type: boolean + procMount: +- description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. ++ description: procMount denotes the type of proc mount to ++ use for the containers. The default is DefaultProcMount ++ which uses the container runtime defaults for readonly ++ paths and masked paths. This requires the ProcMountType ++ feature flag to be enabled. + type: string + readOnlyRootFilesystem: +- description: Whether this container has a read-only root filesystem. Default is false. ++ description: Whether this container has a read-only root ++ filesystem. Default is false. + type: boolean + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The GID to run the entrypoint of the container ++ process. Uses runtime default if unset. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a ++ non-root user. If true, the Kubelet will validate the ++ image at runtime to ensure that it does not run as UID ++ 0 (root) and fail to start the container if it does. If ++ unset or false, no such validation will be performed. ++ May also be set in PodSecurityContext. If set in both ++ SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UID to run the entrypoint of the container ++ process. Defaults to user specified in image metadata ++ if unspecified. May also be set in PodSecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The SELinux context to be applied to the container. ++ If unspecified, the container runtime will allocate a ++ random SELinux context for each container. May also be ++ set in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies ++ to the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies ++ to the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies ++ to the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies ++ to the container. + type: string + type: object + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all ++ containers. If unspecified, the options from the PodSecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named ++ by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the ++ GMSA credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + type: string + type: object + type: object + startupProbe: +- description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. This is a beta feature enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'StartupProbe indicates that the Pod has successfully ++ initialized. If specified, no other probes are executed until ++ this completes successfully. If this probe fails, the Pod ++ will be restarted, just as if the livenessProbe failed. This ++ can be used to provide different probe parameters at the beginning ++ of a Pod''s lifecycle, when it might take a long time to load ++ data or warm a cache, than during steady-state operation. ++ This cannot be updated. This is a beta feature enabled by ++ the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1817,71 +2771,117 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + stdin: +- description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false. ++ description: Whether this container should allocate a buffer ++ for stdin in the container runtime. If this is not set, reads ++ from stdin in the container will always result in EOF. Default ++ is false. + type: boolean + stdinOnce: +- description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false ++ description: Whether the container runtime should close the ++ stdin channel after it has been opened by a single attach. ++ When stdin is true the stdin stream will remain open across ++ multiple attach sessions. If stdinOnce is set to true, stdin ++ is opened on container start, is empty until the first client ++ attaches to stdin, and then remains open and accepts data ++ until the client disconnects, at which time stdin is closed ++ and remains closed until the container is restarted. If this ++ flag is false, a container processes that reads from stdin ++ will never receive an EOF. Default is false + type: boolean + terminationMessagePath: +- description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.' ++ description: 'Optional: Path at which the file to which the ++ container''s termination message will be written is mounted ++ into the container''s filesystem. Message written is intended ++ to be brief final status, such as an assertion failure message. ++ Will be truncated by the node if greater than 4096 bytes. ++ The total message length across all containers will be limited ++ to 12kb. Defaults to /dev/termination-log. Cannot be updated.' + type: string + terminationMessagePolicy: +- description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated. ++ description: Indicate how the termination message should be ++ populated. File will use the contents of terminationMessagePath ++ to populate the container status message on both success and ++ failure. FallbackToLogsOnError will use the last chunk of ++ container log output if the termination message file is empty ++ and the container exited with an error. The log output is ++ limited to 2048 bytes or 80 lines, whichever is smaller. Defaults ++ to File. Cannot be updated. + type: string + tty: +- description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false. ++ description: Whether this container should allocate a TTY for ++ itself, also requires 'stdin' to be true. Default is false. + type: boolean + volumeDevices: +- description: volumeDevices is the list of block devices to be used by the container. ++ description: volumeDevices is the list of block devices to be ++ used by the container. + items: +- description: volumeDevice describes a mapping of a raw block device within a container. ++ description: volumeDevice describes a mapping of a raw block ++ device within a container. + properties: + devicePath: +- description: devicePath is the path inside of the container that the device will be mapped to. ++ description: devicePath is the path inside of the container ++ that the device will be mapped to. + type: string + name: +- description: name must match the name of a persistentVolumeClaim in the pod ++ description: name must match the name of a persistentVolumeClaim ++ in the pod + type: string + required: + - devicePath +@@ -1889,27 +2889,40 @@ + type: object + type: array + volumeMounts: +- description: Pod volumes to mount into the container's filesystem. Cannot be updated. ++ description: Pod volumes to mount into the container's filesystem. ++ Cannot be updated. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume ++ within a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume ++ should be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are ++ propagated from the host to container and the other ++ way around. When not set, MountPropagationNone is used. ++ This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which ++ the container's volume should be mounted. Behaves similarly ++ to SubPath but environment variable references $(VAR_NAME) ++ are expanded using the container's environment. Defaults ++ to "" (volume's root). SubPathExpr and SubPath are mutually ++ exclusive. + type: string + required: + - mountPath +@@ -1917,14 +2930,18 @@ + type: object + type: array + workingDir: +- description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated. ++ description: Container's working directory. If not specified, ++ the container runtime's default will be used, which might ++ be configured in the container image. Cannot be updated. + type: string + required: + - name + type: object + type: array + listenLocal: +- description: ListenLocal makes the Alertmanager server listen on loopback, so that it does not bind against the Pod IP. Note this is only for the Alertmanager UI, not the gossip communication. ++ description: ListenLocal makes the Alertmanager server listen on loopback, ++ so that it does not bind against the Pod IP. Note this is only for ++ the Alertmanager UI, not the gossip communication. + type: boolean + logFormat: + description: Log format for Alertmanager to be configured with. +@@ -1938,33 +2955,48 @@ + description: Define which Nodes the Pods are scheduled on. + type: object + paused: +- description: If set to true all actions on the underlying managed objects are not goint to be performed, except for delete actions. ++ description: If set to true all actions on the underlying managed ++ objects are not goint to be performed, except for delete actions. + type: boolean + podMetadata: +- description: PodMetadata configures Labels and Annotations which are propagated to the alertmanager pods. ++ description: PodMetadata configures Labels and Annotations which are ++ propagated to the alertmanager pods. + properties: + annotations: + additionalProperties: + type: string +- description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' ++ description: 'Annotations is an unstructured key value map stored ++ with a resource that may be set by external tools to store and ++ retrieve arbitrary metadata. They are not queryable and should ++ be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string +- description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' ++ description: 'Map of string keys and values that can be used to ++ organize and categorize (scope and select) objects. May match ++ selectors of replication controllers and services. More info: ++ http://kubernetes.io/docs/user-guide/labels' + type: object + name: +- description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' ++ description: 'Name must be unique within a namespace. Is required ++ when creating resources, although some resources may allow a ++ client to request the generation of an appropriate name automatically. ++ Name is primarily intended for creation idempotence and configuration ++ definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + type: object + portName: +- description: Port name used for the pods and governing service. This defaults to web ++ description: Port name used for the pods and governing service. This ++ defaults to web + type: string + priorityClassName: + description: Priority class assigned to the Pods + type: string + replicas: +- description: Size is the expected size of the alertmanager cluster. The controller will eventually make the size of the running cluster equal to the expected size. ++ description: Size is the expected size of the alertmanager cluster. ++ The controller will eventually make the size of the running cluster ++ equal to the expected size. + format: int32 + type: integer + resources: +@@ -1977,7 +3009,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute resources ++ allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -1986,65 +3019,115 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, otherwise ++ to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + retention: +- description: Time duration Alertmanager shall retain data for. Default is '120h', and must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds seconds minutes hours). ++ description: Time duration Alertmanager shall retain data for. Default ++ is '120h', and must match the regular expression `[0-9]+(ms|s|m|h)` ++ (milliseconds seconds minutes hours). + type: string + routePrefix: +- description: The route prefix Alertmanager registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting 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`. ++ description: The route prefix Alertmanager registers HTTP handlers ++ for. This is useful, if using ExternalURL and a proxy is rewriting ++ 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 + secrets: +- description: Secrets is a list of Secrets in the same namespace as the Alertmanager object, which shall be mounted into the Alertmanager Pods. The Secrets are mounted into /etc/alertmanager/secrets/. ++ description: Secrets is a list of Secrets in the same namespace as ++ the Alertmanager object, which shall be mounted into the Alertmanager ++ Pods. The Secrets are mounted into /etc/alertmanager/secrets/. + items: + type: string + type: array + securityContext: +- description: SecurityContext holds pod-level security attributes and common container settings. This defaults to the default PodSecurityContext. ++ description: SecurityContext holds pod-level security attributes and ++ common container settings. This defaults to the default PodSecurityContext. + properties: + fsGroup: +- description: "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: \n 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- \n If unset, the Kubelet will not modify the ownership and permissions of any volume." ++ description: "A special supplemental group that applies to all ++ containers in a pod. Some volume types allow the Kubelet to ++ change the ownership of that volume to be owned by the pod: ++ \n 1. The owning GID will be the FSGroup 2. The setgid bit is ++ set (new files created in the volume will be owned by FSGroup) ++ 3. The permission bits are OR'd with rw-rw---- \n If unset, ++ the Kubelet will not modify the ownership and permissions of ++ any volume." + format: int64 + type: integer + fsGroupChangePolicy: +- description: 'fsGroupChangePolicy defines behavior of changing ownership and permission of the volume before being exposed inside Pod. This field will only apply to volume types which support fsGroup based ownership(and permissions). It will have no effect on ephemeral volume types such as: secret, configmaps and emptydir. Valid values are "OnRootMismatch" and "Always". If not specified defaults to "Always".' ++ description: 'fsGroupChangePolicy defines behavior of changing ++ ownership and permission of the volume before being exposed ++ inside Pod. This field will only apply to volume types which ++ support fsGroup based ownership(and permissions). It will have ++ no effect on ephemeral volume types such as: secret, configmaps ++ and emptydir. Valid values are "OnRootMismatch" and "Always". ++ If not specified defaults to "Always".' + type: string + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The GID to run the entrypoint of the container process. ++ Uses runtime default if unset. May also be set in SecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the value ++ specified in SecurityContext takes precedence for that container. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a non-root ++ user. If true, the Kubelet will validate the image at runtime ++ to ensure that it does not run as UID 0 (root) and fail to start ++ the container if it does. If unset or false, no such validation ++ will be performed. May also be set in SecurityContext. If set ++ in both SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The UID to run the entrypoint of the container process. ++ Defaults to user specified in image metadata if unspecified. ++ May also be set in SecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence for that container. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to all containers. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The SELinux context to be applied to all containers. ++ If unspecified, the container runtime will allocate a random ++ SELinux context for each container. May also be set in SecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the value ++ specified in SecurityContext takes precedence for that container. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies to ++ the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies to ++ the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies to ++ the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies to ++ the container. + type: string + type: object + supplementalGroups: +- description: A list of groups applied to the first process run in each container, in addition to the container's primary GID. If unspecified, no groups will be added to any container. ++ description: A list of groups applied to the first process run ++ in each container, in addition to the container's primary GID. If ++ unspecified, no groups will be added to any container. + items: + format: int64 + type: integer + type: array + sysctls: +- description: Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported sysctls (by the container runtime) might fail to launch. ++ description: Sysctls hold a list of namespaced sysctls used for ++ the pod. Pods with unsupported sysctls (by the container runtime) ++ might fail to launch. + items: + description: Sysctl defines a kernel parameter to be set + properties: +@@ -2060,42 +3143,72 @@ + type: object + type: array + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options within a container's SecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all containers. ++ If unspecified, the options within a container's SecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named by ++ the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the GMSA ++ credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set in PodSecurityContext. ++ If set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + type: string + type: object + type: object + serviceAccountName: +- description: ServiceAccountName is the name of the ServiceAccount to use to run the Prometheus Pods. ++ description: ServiceAccountName is the name of the ServiceAccount ++ to use to run the Prometheus Pods. + type: string + sha: +- description: 'SHA of Alertmanager container image to be deployed. Defaults to the value of `version`. Similar to a tag, but the SHA explicitly deploys an immutable container image. Version and Tag are ignored if SHA is set. Deprecated: use ''image'' instead. The image digest can be specified as part of the image URL.' ++ description: 'SHA of Alertmanager container image to be deployed. ++ Defaults to the value of `version`. Similar to a tag, but the SHA ++ explicitly deploys an immutable container image. Version and Tag ++ are ignored if SHA is set. Deprecated: use ''image'' instead. The ++ image digest can be specified as part of the image URL.' + type: string + storage: +- description: Storage is the definition of how storage will be used by the Alertmanager instances. ++ description: Storage is the definition of how storage will be used ++ by the Alertmanager instances. + properties: + disableMountSubPath: +- description: 'Deprecated: subPath usage will be disabled by default in a future release, this option will become unnecessary. DisableMountSubPath allows to remove any subPath usage in volume mounts.' ++ description: 'Deprecated: subPath usage will be disabled by default ++ in a future release, this option will become unnecessary. DisableMountSubPath ++ allows to remove any subPath usage in volume mounts.' + type: boolean + emptyDir: +- description: 'EmptyDirVolumeSource to be used by the Prometheus StatefulSets. If specified, used in place of any volumeClaimTemplate. More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir' ++ description: 'EmptyDirVolumeSource to be used by the Prometheus ++ StatefulSets. If specified, used in place of any volumeClaimTemplate. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir' + properties: + medium: +- description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'What type of storage medium should back this ++ directory. The default is "" which means to use the node''s ++ default medium. Must be an empty string (default) or Memory. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + type: string + sizeLimit: + anyOf: + - type: integer + - type: string +- description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' ++ description: 'Total amount of local storage required for this ++ EmptyDir volume. The size limit is also applicable for memory ++ medium. The maximum usage on memory medium EmptyDir would ++ be the minimum value between the SizeLimit specified here ++ and the sum of memory limits of all containers in a pod. ++ The default is nil which means that the limit is undefined. ++ More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object +@@ -2103,41 +3216,79 @@ + description: A PVC spec to be used by the Prometheus StatefulSets. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this ++ representation of an object. Servers should convert recognized ++ schemas to the latest internal value, and may reject unrecognized ++ values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST ++ resource this object represents. Servers may infer this ++ from the endpoint the client submits requests to. Cannot ++ be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: +- description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource. ++ description: EmbeddedMetadata contains metadata relevant to ++ an EmbeddedResource. + properties: + annotations: + additionalProperties: + type: string +- description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' ++ description: 'Annotations is an unstructured key value ++ map stored with a resource that may be set by external ++ tools to store and retrieve arbitrary metadata. They ++ are not queryable and should be preserved when modifying ++ objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string +- description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' ++ description: 'Map of string keys and values that can be ++ used to organize and categorize (scope and select) objects. ++ May match selectors of replication controllers and services. ++ More info: http://kubernetes.io/docs/user-guide/labels' + type: object + name: +- description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' ++ description: 'Name must be unique within a namespace. ++ Is required when creating resources, although some resources ++ may allow a client to request the generation of an appropriate ++ name automatically. Name is primarily intended for creation ++ idempotence and configuration definition. Cannot be ++ updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + type: object + spec: +- description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'Spec defines the desired characteristics of ++ a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + accessModes: +- description: 'AccessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' ++ description: 'AccessModes contains the desired access ++ modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' + items: + type: string + type: array + dataSource: +- description: 'This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot - Beta) * An existing PVC (PersistentVolumeClaim) * An existing custom resource/object that implements data population (Alpha) In order to use VolumeSnapshot object types, the appropriate feature gate must be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. If the specified data source is not supported, the volume will not be created and the failure will be reported as an event. In the future, we plan to support more data source types and the behavior of the provisioner may change.' ++ description: 'This field can be used to specify either: ++ * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot ++ - Beta) * An existing PVC (PersistentVolumeClaim) * ++ An existing custom resource/object that implements data ++ population (Alpha) In order to use VolumeSnapshot object ++ types, the appropriate feature gate must be enabled ++ (VolumeSnapshotDataSource or AnyVolumeDataSource) If ++ the provisioner or an external controller can support ++ the specified data source, it will create a new volume ++ based on the contents of the specified data source. ++ If the specified data source is not supported, the volume ++ will not be created and the failure will be reported ++ as an event. In the future, we plan to support more ++ data source types and the behavior of the provisioner ++ may change.' + properties: + apiGroup: +- description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required. ++ description: APIGroup is the group for the resource ++ being referenced. If APIGroup is not specified, ++ the specified Kind must be in the core API group. ++ For any other third-party types, APIGroup is required. + type: string + kind: + description: Kind is the type of resource being referenced +@@ -2150,7 +3301,8 @@ + - name + type: object + resources: +- description: 'Resources represents the minimum resources the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' ++ description: 'Resources represents the minimum resources ++ the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' + properties: + limits: + additionalProperties: +@@ -2159,7 +3311,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount ++ of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -2168,25 +3321,41 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount ++ of compute resources required. If Requests is omitted ++ for a container, it defaults to Limits if that is ++ explicitly specified, otherwise to an implementation-defined ++ value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + selector: +- description: A label query over volumes to consider for binding. ++ description: A label query over volumes to consider for ++ binding. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that ++ relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, ++ NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values ++ array must be non-empty. If the operator is ++ Exists or DoesNotExist, the values array must ++ be empty. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -2198,24 +3367,34 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field ++ is "key", the operator is "In", and the values array ++ contains only "value". The requirements are ANDed. + type: object + type: object + storageClassName: +- description: 'Name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' ++ description: 'Name of the StorageClass required by the ++ claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string + volumeMode: +- description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. ++ description: volumeMode defines what type of volume is ++ required by the claim. Value of Filesystem is implied ++ when not included in claim spec. + type: string + volumeName: +- description: VolumeName is the binding reference to the PersistentVolume backing this claim. ++ description: VolumeName is the binding reference to the ++ PersistentVolume backing this claim. + type: string + type: object + status: +- description: 'Status represents the current information/status of a persistent volume claim. Read-only. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'Status represents the current information/status ++ of a persistent volume claim. Read-only. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + accessModes: +- description: 'AccessModes contains the actual access modes the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' ++ description: 'AccessModes contains the actual access modes ++ the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' + items: + type: string + type: array +@@ -2226,31 +3405,42 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: Represents the actual resources of the underlying volume. ++ description: Represents the actual resources of the underlying ++ volume. + type: object + conditions: +- description: Current Condition of persistent volume claim. If underlying persistent volume is being resized then the Condition will be set to 'ResizeStarted'. ++ description: Current Condition of persistent volume claim. ++ If underlying persistent volume is being resized then ++ the Condition will be set to 'ResizeStarted'. + items: +- description: PersistentVolumeClaimCondition contails details about state of pvc ++ description: PersistentVolumeClaimCondition contails ++ details about state of pvc + properties: + lastProbeTime: + description: Last time we probed the condition. + format: date-time + type: string + lastTransitionTime: +- description: Last time the condition transitioned from one status to another. ++ description: Last time the condition transitioned ++ from one status to another. + format: date-time + type: string + message: +- description: Human-readable message indicating details about last transition. ++ description: Human-readable message indicating details ++ about last transition. + type: string + reason: +- description: Unique, this should be a short, machine understandable string that gives the reason for condition's last transition. If it reports "ResizeStarted" that means the underlying persistent volume is being resized. ++ description: Unique, this should be a short, machine ++ understandable string that gives the reason for ++ condition's last transition. If it reports "ResizeStarted" ++ that means the underlying persistent volume is ++ being resized. + type: string + status: + type: string + type: +- description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type ++ description: PersistentVolumeClaimConditionType ++ is a valid value of PersistentVolumeClaimCondition.Type + type: string + required: + - status +@@ -2264,52 +3454,85 @@ + type: object + type: object + tag: +- description: 'Tag of Alertmanager container image to be deployed. Defaults to the value of `version`. Version is ignored if Tag is set. Deprecated: use ''image'' instead. The image tag can be specified as part of the image URL.' ++ description: 'Tag of Alertmanager container image to be deployed. ++ Defaults to the value of `version`. Version is ignored if Tag is ++ set. Deprecated: use ''image'' instead. The image tag can be specified ++ as part of the image URL.' + type: string + tolerations: + description: If specified, the pod's tolerations. + items: +- description: The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . ++ description: The pod this Toleration is attached to tolerates any ++ taint that matches the triple using the matching ++ operator . + properties: + effect: +- description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. ++ description: Effect indicates the taint effect to match. Empty ++ means match all taint effects. When specified, allowed values ++ are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: +- description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys. ++ description: Key is the taint key that the toleration applies ++ to. Empty means match all taint keys. If the key is empty, ++ operator must be Exists; this combination means to match all ++ values and all keys. + type: string + operator: +- description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category. ++ description: Operator represents a key's relationship to the ++ value. Valid operators are Exists and Equal. Defaults to Equal. ++ Exists is equivalent to wildcard for value, so that a pod ++ can tolerate all taints of a particular category. + type: string + tolerationSeconds: +- description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system. ++ description: TolerationSeconds represents the period of time ++ the toleration (which must be of effect NoExecute, otherwise ++ this field is ignored) tolerates the taint. By default, it ++ is not set, which means tolerate the taint forever (do not ++ evict). Zero and negative values will be treated as 0 (evict ++ immediately) by the system. + format: int64 + type: integer + value: +- description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string. ++ description: Value is the taint value the toleration matches ++ to. If the operator is Exists, the value should be empty, ++ otherwise just a regular string. + type: string + type: object + type: array + topologySpreadConstraints: + description: If specified, the pod's topology spread constraints. + items: +- description: TopologySpreadConstraint specifies how to spread matching pods among the given topology. ++ description: TopologySpreadConstraint specifies how to spread matching ++ pods among the given topology. + properties: + labelSelector: +- description: LabelSelector is used to find matching pods. Pods that match this label selector are counted to determine the number of pods in their corresponding topology domain. ++ description: LabelSelector is used to find matching pods. Pods ++ that match this label selector are counted to determine the ++ number of pods in their corresponding topology domain. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that relates ++ the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, NotIn, ++ Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values array ++ must be non-empty. If the operator is Exists or ++ DoesNotExist, the values array must be empty. This ++ array is replaced during a strategic merge patch. + items: + type: string + type: array +@@ -2321,18 +3544,48 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field is ++ "key", the operator is "In", and the values array contains ++ only "value". The requirements are ANDed. + type: object + type: object + maxSkew: +- description: 'MaxSkew describes the degree to which pods may be unevenly distributed. It''s the maximum permitted difference between the number of matching pods in any two topology domains of a given topology type. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 1/1/0: | zone1 | zone2 | zone3 | | P | P | | - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 1/1/1; scheduling it onto zone1(zone2) would make the ActualSkew(2-0) on zone1(zone2) violate MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled onto any zone. It''s a required field. Default value is 1 and 0 is not allowed.' ++ description: 'MaxSkew describes the degree to which pods may ++ be unevenly distributed. It''s the maximum permitted difference ++ between the number of matching pods in any two topology domains ++ of a given topology type. For example, in a 3-zone cluster, ++ MaxSkew is set to 1, and pods with the same labelSelector ++ spread as 1/1/0: | zone1 | zone2 | zone3 | | P | P | | ++ - if MaxSkew is 1, incoming pod can only be scheduled to zone3 ++ to become 1/1/1; scheduling it onto zone1(zone2) would make ++ the ActualSkew(2-0) on zone1(zone2) violate MaxSkew(1). - ++ if MaxSkew is 2, incoming pod can be scheduled onto any zone. ++ It''s a required field. Default value is 1 and 0 is not allowed.' + format: int32 + type: integer + topologyKey: +- description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each as a "bucket", and try to put balanced number of pods into each bucket. It's a required field. ++ description: TopologyKey is the key of node labels. Nodes that ++ have a label with this key and identical values are considered ++ to be in the same topology. We consider each ++ as a "bucket", and try to put balanced number of pods into ++ each bucket. It's a required field. + type: string + whenUnsatisfiable: +- description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it - ScheduleAnyway tells the scheduler to still schedule it It''s considered as "Unsatisfiable" if and only if placing incoming pod on any topology violates "MaxSkew". For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.' ++ description: 'WhenUnsatisfiable indicates how to deal with a ++ pod if it doesn''t satisfy the spread constraint. - DoNotSchedule ++ (default) tells the scheduler not to schedule it - ScheduleAnyway ++ tells the scheduler to still schedule it It''s considered ++ as "Unsatisfiable" if and only if placing incoming pod on ++ any topology violates "MaxSkew". For example, in a 3-zone ++ cluster, MaxSkew is set to 1, and pods with the same labelSelector ++ spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | ++ If WhenUnsatisfiable is set to DoNotSchedule, incoming pod ++ can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) ++ as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In ++ other words, the cluster can still be imbalanced, but scheduler ++ won''t make it *more* imbalanced. It''s a required field.' + type: string + required: + - maxSkew +@@ -2344,27 +3597,41 @@ + description: Version the cluster should be on. + type: string + volumeMounts: +- description: VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the alertmanager container, that are generated as a result of StorageSpec objects. ++ description: VolumeMounts allows configuration of additional VolumeMounts ++ on the output StatefulSet definition. VolumeMounts specified will ++ be appended to other VolumeMounts in the alertmanager container, ++ that are generated as a result of StorageSpec objects. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume within ++ a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume should ++ be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are propagated ++ from the host to container and the other way around. When ++ not set, MountPropagationNone is used. This field is beta ++ in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which the ++ container's volume should be mounted. Behaves similarly to ++ SubPath but environment variable references $(VAR_NAME) are ++ expanded using the container's environment. Defaults to "" ++ (volume's root). SubPathExpr and SubPath are mutually exclusive. + type: string + required: + - mountPath +@@ -2372,31 +3639,50 @@ + type: object + type: array + volumes: +- description: Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. ++ description: Volumes allows configuration of additional volumes on ++ the output StatefulSet definition. Volumes specified will be appended ++ to other volumes that are generated as a result of StorageSpec objects. + items: +- description: Volume represents a named volume in a pod that may be accessed by any container in the pod. ++ description: Volume represents a named volume in a pod that may ++ be accessed by any container in the pod. + properties: + awsElasticBlockStore: +- description: 'AWSElasticBlockStore represents an AWS Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'AWSElasticBlockStore represents an AWS Disk resource ++ that is attached to a kubelet''s host machine and then exposed ++ to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + partition: +- description: 'The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).' ++ description: 'The partition in the volume that you want ++ to mount. If omitted, the default is to mount by volume ++ name. Examples: For volume /dev/sda1, you specify the ++ partition as "1". Similarly, the volume partition for ++ /dev/sda is "0" (or you can leave the property empty).' + format: int32 + type: integer + readOnly: +- description: 'Specify "true" to force and set the ReadOnly property in VolumeMounts to "true". If omitted, the default is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'Specify "true" to force and set the ReadOnly ++ property in VolumeMounts to "true". If omitted, the default ++ is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + type: boolean + volumeID: +- description: 'Unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'Unique ID of the persistent disk resource ++ in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + type: string + 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. + properties: + cachingMode: + description: 'Host Caching mode: None, Read Only, Read Write.' +@@ -2408,26 +3694,35 @@ + description: The URI the data disk in the blob storage + type: string + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + kind: +- description: 'Expected values Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared' ++ description: 'Expected values Shared: multiple blob disks ++ per storage account Dedicated: single blob disk per storage ++ account Managed: azure managed data disk (only in managed ++ availability set). defaults to shared' + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + required: + - 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. + properties: + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretName: +- description: the name of secret that contains Azure Storage Account Name and Key ++ description: the name of secret that contains Azure Storage ++ Account Name and Key + type: string + shareName: + description: Share Name +@@ -2437,66 +3732,99 @@ + - 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 + properties: + monitors: +- description: 'Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Required: Monitors is a collection of Ceph ++ monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + items: + type: string + type: array + path: +- description: 'Optional: Used as the mounted root, rather than the full Ceph tree, default is /' ++ description: 'Optional: Used as the mounted root, rather ++ than the full Ceph tree, default is /' + type: string + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: boolean + secretFile: +- description: 'Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: SecretFile is the path to key ring ++ for User, default is /etc/ceph/user.secret More info: ++ https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: string + secretRef: +- description: 'Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: SecretRef is reference to the authentication ++ secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + user: +- description: 'Optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: User is the rados user name, default ++ is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: string + required: + - monitors + type: object + cinder: +- description: 'Cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Cinder represents a cinder volume attached and ++ mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + properties: + fsType: +- description: 'Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Examples: ++ "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" ++ if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: string + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: boolean + secretRef: +- description: 'Optional: points to a secret object containing parameters used to connect to OpenStack.' ++ description: 'Optional: points to a secret object containing ++ parameters used to connect to OpenStack.' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + volumeID: +- description: 'volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'volume id used to identify the volume in cinder. ++ More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: string + required: + - volumeID + type: object + configMap: +- description: ConfigMap represents a configMap that should populate this volume ++ description: ConfigMap represents a configMap that should populate ++ this volume + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: +- description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair in the ++ Data field of the referenced ConfigMap will be projected ++ into the volume as a file whose name is the key and content ++ is the value. If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys will not be ++ present. If a key is specified which is not present in ++ the ConfigMap, the volume setup will error unless it is ++ marked optional. Paths must be relative and may not contain ++ the '..' path or start with '..'. + items: + description: Maps a string key to a path within a volume. + properties: +@@ -2504,11 +3832,19 @@ + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file to map ++ the key to. May not be an absolute path. May not ++ contain the path element '..'. May not start with ++ the string '..'. + type: string + required: + - key +@@ -2516,81 +3852,124 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its keys must be defined ++ description: Specify whether the ConfigMap or its keys must ++ be defined + type: boolean + type: object + csi: +- description: CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature). ++ description: CSI (Container Storage Interface) represents storage ++ that is handled by an external CSI driver (Alpha feature). + properties: + driver: +- description: Driver is the name of the CSI driver that handles this volume. Consult with your admin for the correct name as registered in the cluster. ++ description: Driver is the name of the CSI driver that handles ++ this volume. Consult with your admin for the correct name ++ as registered in the cluster. + type: string + fsType: +- description: Filesystem type to mount. Ex. "ext4", "xfs", "ntfs". If not provided, the empty value is passed to the associated CSI driver which will determine the default filesystem to apply. ++ description: Filesystem type to mount. Ex. "ext4", "xfs", ++ "ntfs". If not provided, the empty value is passed to ++ the associated CSI driver which will determine the default ++ filesystem to apply. + type: string + nodePublishSecretRef: +- description: NodePublishSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, and may be empty if no secret is required. If the secret object contains more than one secret, all secret references are passed. ++ description: NodePublishSecretRef is a reference to the ++ secret object containing sensitive information to pass ++ to the CSI driver to complete the CSI NodePublishVolume ++ and NodeUnpublishVolume calls. This field is optional, ++ and may be empty if no secret is required. If the secret ++ object contains more than one secret, all secret references ++ are passed. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + readOnly: +- description: Specifies a read-only configuration for the volume. Defaults to false (read/write). ++ description: Specifies a read-only configuration for the ++ volume. Defaults to false (read/write). + type: boolean + volumeAttributes: + additionalProperties: + type: string +- description: VolumeAttributes stores driver-specific properties that are passed to the CSI driver. Consult your driver's documentation for supported values. ++ description: VolumeAttributes stores driver-specific properties ++ that are passed to the CSI driver. Consult your driver's ++ documentation for supported values. + type: object + required: + - driver + type: object + downwardAPI: +- description: DownwardAPI represents downward API about the pod that should populate this volume ++ description: DownwardAPI represents downward API about the pod ++ that should populate this volume + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: + description: Items is a list of downward API volume file + items: +- description: DownwardAPIVolumeFile represents information to create the file containing the pod field ++ description: DownwardAPIVolumeFile represents information ++ to create the file containing the pod field + properties: + fieldRef: +- description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' ++ description: 'Required: Selects a field of the pod: ++ only annotations, labels, name and namespace are ++ supported.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: 'Required: Path is the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..''' ++ description: 'Required: Path is the relative path ++ name of the file to be created. Must not be absolute ++ or contain the ''..'' path. Must be utf-8 encoded. ++ The first item of the relative path must not start ++ with ''..''' + type: string + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, requests.cpu and requests.memory) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -2605,31 +3984,48 @@ + type: array + type: object + emptyDir: +- description: 'EmptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'EmptyDir represents a temporary directory that ++ shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + properties: + medium: +- description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'What type of storage medium should back this ++ directory. The default is "" which means to use the node''s ++ default medium. Must be an empty string (default) or Memory. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + type: string + sizeLimit: + anyOf: + - type: integer + - type: string +- description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' ++ description: 'Total amount of local storage required for ++ this EmptyDir volume. The size limit is also applicable ++ for memory medium. The maximum usage on memory medium ++ EmptyDir would be the minimum value between the SizeLimit ++ specified here and the sum of memory limits of all containers ++ in a pod. The default is nil which means that the limit ++ is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + fc: +- description: FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. ++ description: FC represents a Fibre Channel resource that is ++ attached to a kubelet's host machine and then exposed to the ++ pod. + properties: + fsType: +- description: 'Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + lun: + description: 'Optional: FC target lun number' + format: int32 + type: integer + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts.' + type: boolean + targetWWNs: + description: 'Optional: FC target worldwide names (WWNs)' +@@ -2637,19 +4033,26 @@ + type: string + type: array + wwids: +- description: 'Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.' ++ description: 'Optional: FC volume world wide identifiers ++ (wwids) Either wwids or combination of targetWWNs and ++ lun must be set, but not both simultaneously.' + items: + type: string + type: array + type: object + flexVolume: +- description: FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. ++ description: FlexVolume represents a generic volume resource ++ that is provisioned/attached using an exec based plugin. + properties: + driver: +- description: Driver is the name of the driver to use for this volume. ++ description: Driver is the name of the driver to use for ++ this volume. + type: string + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". The default filesystem depends on FlexVolume ++ script. + type: string + options: + additionalProperties: +@@ -2657,52 +4060,85 @@ + description: 'Optional: Extra command options if any.' + type: object + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts.' + type: boolean + secretRef: +- description: 'Optional: SecretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.' ++ description: 'Optional: SecretRef is reference to the secret ++ object containing sensitive information to pass to the ++ plugin scripts. This may be empty if no secret object ++ is specified. If the secret object contains more than ++ one secret, all secrets are passed to the plugin scripts.' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + 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 + properties: + datasetName: +- description: Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated ++ description: Name of the dataset stored as metadata -> name ++ on the dataset for Flocker should be considered as deprecated + type: string + datasetUUID: +- description: UUID of the dataset. This is unique identifier of a Flocker dataset ++ description: UUID of the dataset. This is unique identifier ++ of a Flocker dataset + type: string + type: object + gcePersistentDisk: +- description: 'GCEPersistentDisk represents a GCE Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'GCEPersistentDisk represents a GCE Disk resource ++ that is attached to a kubelet''s host machine and then exposed ++ to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + partition: +- description: 'The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'The partition in the volume that you want ++ to mount. If omitted, the default is to mount by volume ++ name. Examples: For volume /dev/sda1, you specify the ++ partition as "1". Similarly, the volume partition for ++ /dev/sda is "0" (or you can leave the property empty). ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + format: int32 + type: integer + pdName: +- description: 'Unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'Unique name of the PD resource in GCE. Used ++ to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + type: string + readOnly: +- description: 'ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + type: boolean + required: + - pdName + 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 EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod''s container.' ++ description: 'GitRepo represents a git repository at a particular ++ revision. 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: +- description: Target directory name. Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name. ++ description: Target directory name. Must not contain or ++ start with '..'. If '.' is supplied, the volume directory ++ will be the git repository. Otherwise, if specified, ++ the volume will contain the git repository in the subdirectory ++ with the given name. + type: string + repository: + description: Repository URL +@@ -2714,35 +4150,51 @@ + - repository + type: object + glusterfs: +- description: 'Glusterfs represents a Glusterfs mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' ++ description: 'Glusterfs represents a Glusterfs mount on the ++ host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' + properties: + endpoints: +- description: 'EndpointsName is the endpoint name that details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'EndpointsName is the endpoint name that details ++ Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: string + path: +- description: 'Path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'Path is the Glusterfs volume path. More info: ++ https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: string + readOnly: +- description: 'ReadOnly here will force the Glusterfs volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'ReadOnly here will force the Glusterfs volume ++ to be mounted with read-only permissions. Defaults to ++ false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: boolean + required: + - endpoints + - path + type: object + hostPath: +- description: 'HostPath represents a pre-existing file or directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the host machine. Most containers will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath --- TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not mount host directories as read/write.' ++ description: 'HostPath represents a pre-existing file or directory ++ on the host machine that is directly exposed to the container. ++ This is generally used for system agents or other privileged ++ things that are allowed to see the host machine. Most containers ++ will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath ++ --- TODO(jonesdl) We need to restrict who can use host directory ++ mounts and who can/can not mount host directories as read/write.' + properties: + path: +- description: 'Path of the directory on the host. If the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' ++ description: 'Path of the directory on the host. If the ++ path is a symlink, it will follow the link to the real ++ path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + type: +- description: 'Type for HostPath Volume Defaults to "" More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' ++ description: 'Type for HostPath Volume Defaults to "" More ++ info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + required: + - path + type: object + iscsi: +- description: 'ISCSI represents an ISCSI Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' ++ description: 'ISCSI represents an ISCSI Disk resource that is ++ attached to a kubelet''s host machine and then exposed to ++ the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' + properties: + chapAuthDiscovery: + description: whether support iSCSI Discovery CHAP authentication +@@ -2751,38 +4203,55 @@ + description: whether support iSCSI Session CHAP authentication + type: boolean + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + initiatorName: +- description: Custom iSCSI Initiator Name. If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface : will be created for the connection. ++ description: Custom iSCSI Initiator Name. If initiatorName ++ is specified with iscsiInterface simultaneously, new iSCSI ++ interface : will be created ++ for the connection. + type: string + iqn: + description: Target iSCSI Qualified Name. + type: string + iscsiInterface: +- description: iSCSI Interface Name that uses an iSCSI transport. Defaults to 'default' (tcp). ++ description: iSCSI Interface Name that uses an iSCSI transport. ++ Defaults to 'default' (tcp). + type: string + lun: + description: iSCSI Target Lun number. + format: int32 + type: integer + portals: +- description: iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260). ++ description: iSCSI Target Portal List. The portal is either ++ an IP or ip_addr:port if the port is other than default ++ (typically TCP ports 860 and 3260). + items: + type: string + type: array + readOnly: +- description: ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. ++ description: ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. + type: boolean + secretRef: +- description: CHAP Secret for iSCSI target and initiator authentication ++ description: CHAP Secret for iSCSI target and initiator ++ authentication + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + targetPortal: +- description: iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260). ++ description: iSCSI Target Portal. The Portal is either an ++ IP or ip_addr:port if the port is other than default (typically ++ TCP ports 860 and 3260). + type: string + required: + - iqn +@@ -2790,56 +4259,76 @@ + - targetPortal + type: object + name: +- description: 'Volume''s name. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' ++ description: 'Volume''s name. Must be a DNS_LABEL and unique ++ within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + nfs: +- description: 'NFS represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'NFS represents an NFS mount on the host that shares ++ a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + properties: + path: +- description: 'Path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'Path that is exported by the NFS server. More ++ info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: string + readOnly: +- description: 'ReadOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'ReadOnly here will force the NFS export to ++ be mounted with read-only permissions. Defaults to false. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: boolean + server: +- description: 'Server is the hostname or IP address of the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'Server is the hostname or IP address of the ++ NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: string + required: + - path + - server + type: object + persistentVolumeClaim: +- description: 'PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'PersistentVolumeClaimVolumeSource represents a ++ reference to a PersistentVolumeClaim in the same namespace. ++ More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + claimName: +- description: 'ClaimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'ClaimName is the name of a PersistentVolumeClaim ++ in the same namespace as the pod using this volume. More ++ info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + type: string + readOnly: +- description: Will force the ReadOnly setting in VolumeMounts. Default false. ++ description: Will force the ReadOnly setting in VolumeMounts. ++ Default false. + type: boolean + 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 + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + pdID: +- description: ID that identifies Photon Controller persistent disk ++ description: ID that identifies Photon Controller persistent ++ disk + type: string + 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 + properties: + fsType: +- description: FSType represents the filesystem type to mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified. ++ description: FSType represents the filesystem type to mount ++ Must be a filesystem type supported by the host operating ++ system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" ++ if unspecified. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + volumeID: + description: VolumeID uniquely identifies a Portworx volume +@@ -2848,34 +4337,62 @@ + - volumeID + type: object + projected: +- description: Items for all in one resources secrets, configmaps, and downward API ++ description: Items for all in one resources secrets, configmaps, ++ and downward API + properties: + defaultMode: +- description: Mode bits to use on created files by default. Must be a value between 0 and 0777. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set. ++ description: Mode bits to use on created files by default. ++ Must be a value between 0 and 0777. Directories within ++ the path are not affected by this setting. This might ++ be in conflict with other options that affect the file ++ mode, like fsGroup, and the result can be other mode bits ++ set. + format: int32 + type: integer + sources: + description: list of volume projections + items: +- description: Projection that may be projected along with other supported volume types ++ description: Projection that may be projected along with ++ other supported volume types + properties: + configMap: +- description: information about the configMap data to project ++ description: information about the configMap data ++ to project + properties: + items: +- description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair ++ in the Data field of the referenced ConfigMap ++ will be projected into the volume as a file ++ whose name is the key and content is the value. ++ If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys ++ will not be present. If a key is specified which ++ is not present in the ConfigMap, the volume ++ setup will error unless it is marked optional. ++ Paths must be relative and may not contain the ++ '..' path or start with '..'. + items: +- description: Maps a string key to a path within a volume. ++ description: Maps a string key to a path within ++ a volume. + properties: + key: + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file ++ to map the key to. May not be an absolute ++ path. May not contain the path element ++ '..'. May not start with the string '..'. + type: string + required: + - key +@@ -2883,54 +4400,85 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its keys must be defined ++ description: Specify whether the ConfigMap or ++ its keys must be defined + type: boolean + type: object + downwardAPI: +- description: information about the downwardAPI data to project ++ description: information about the downwardAPI data ++ to project + properties: + items: +- description: Items is a list of DownwardAPIVolume file ++ description: Items is a list of DownwardAPIVolume ++ file + items: +- description: DownwardAPIVolumeFile represents information to create the file containing the pod field ++ description: DownwardAPIVolumeFile represents ++ information to create the file containing ++ the pod field + properties: + fieldRef: +- description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' ++ description: 'Required: Selects a field ++ of the pod: only annotations, labels, ++ name and namespace are supported.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the ++ FieldPath is written in terms of, ++ defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select ++ in the specified API version. + type: string + required: + - fieldPath + type: object + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: 'Required: Path is the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..''' ++ description: 'Required: Path is the relative ++ path name of the file to be created. Must ++ not be absolute or contain the ''..'' ++ path. Must be utf-8 encoded. The first ++ item of the relative path must not start ++ with ''..''' + type: string + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.' ++ description: 'Selects a resource of the ++ container: only resources limits and requests ++ (limits.cpu, limits.memory, requests.cpu ++ and requests.memory) are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required ++ for volumes, optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format ++ of the exposed resources, defaults ++ to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +- description: 'Required: resource to select' ++ description: 'Required: resource to ++ select' + type: string + required: + - resource +@@ -2941,22 +4489,43 @@ + type: array + type: object + secret: +- description: information about the secret data to project ++ description: information about the secret data to ++ project + properties: + items: +- description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair ++ in the Data field of the referenced Secret will ++ be projected into the volume as a file whose ++ name is the key and content is the value. If ++ specified, the listed keys will be projected ++ into the specified paths, and unlisted keys ++ will not be present. If a key is specified which ++ is not present in the Secret, the volume setup ++ will error unless it is marked optional. Paths ++ must be relative and may not contain the '..' ++ path or start with '..'. + items: +- description: Maps a string key to a path within a volume. ++ description: Maps a string key to a path within ++ a volume. + properties: + key: + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file ++ to map the key to. May not be an absolute ++ path. May not contain the path element ++ '..'. May not start with the string '..'. + type: string + required: + - key +@@ -2964,24 +4533,44 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + type: object + serviceAccountToken: +- description: information about the serviceAccountToken data to project ++ description: information about the serviceAccountToken ++ data to project + properties: + audience: +- description: Audience is the intended audience of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise should reject the token. The audience defaults to the identifier of the apiserver. ++ description: Audience is the intended audience ++ of the token. A recipient of a token must identify ++ itself with an identifier specified in the audience ++ of the token, and otherwise should reject the ++ token. The audience defaults to the identifier ++ of the apiserver. + type: string + expirationSeconds: +- description: ExpirationSeconds is the requested duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively rotate the service account token. The kubelet will start trying to rotate the token if the token is older than 80 percent of its time to live or if the token is older than 24 hours.Defaults to 1 hour and must be at least 10 minutes. ++ description: ExpirationSeconds is the requested ++ duration of validity of the service account ++ token. As the token approaches expiration, the ++ kubelet volume plugin will proactively rotate ++ the service account token. The kubelet will ++ start trying to rotate the token if the token ++ is older than 80 percent of its time to live ++ or if the token is older than 24 hours.Defaults ++ to 1 hour and must be at least 10 minutes. + format: int64 + type: integer + path: +- description: Path is the path relative to the mount point of the file to project the token into. ++ description: Path is the path relative to the ++ mount point of the file to project the token ++ into. + type: string + required: + - path +@@ -2992,103 +4581,143 @@ + - sources + 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 + properties: + group: +- description: Group to map volume access to Default is no group ++ description: Group to map volume access to Default is no ++ group + type: string + readOnly: +- description: ReadOnly here will force the Quobyte volume to be mounted with read-only permissions. Defaults to false. ++ description: ReadOnly here will force the Quobyte volume ++ to be mounted with read-only permissions. Defaults to ++ false. + type: boolean + registry: +- description: Registry represents a single or multiple Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes ++ description: Registry represents a single or multiple Quobyte ++ Registry services specified as a string as host:port pair ++ (multiple entries are separated with commas) which acts ++ as the central registry for volumes + type: string + tenant: +- description: Tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin ++ description: Tenant owning the given Quobyte volume in the ++ Backend Used with dynamically provisioned Quobyte volumes, ++ value is set by the plugin + type: string + user: +- description: User to map volume access to Defaults to serivceaccount user ++ description: User to map volume access to Defaults to serivceaccount ++ user + type: string + volume: +- description: Volume is a string that references an already created Quobyte volume by name. ++ description: Volume is a string that references an already ++ created Quobyte volume by name. + type: string + required: + - registry + - volume + type: object + rbd: +- description: 'RBD represents a Rados Block Device mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' ++ description: 'RBD represents a Rados Block Device mount on the ++ host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + image: + description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + keyring: +- description: 'Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'Keyring is the path to key ring for RBDUser. ++ Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + monitors: +- description: 'A collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'A collection of Ceph monitors. More info: ++ https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + items: + type: string + type: array + pool: +- description: 'The rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'The rados pool name. Default is rbd. More ++ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + readOnly: +- description: 'ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: boolean + secretRef: +- description: 'SecretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'SecretRef is name of the authentication secret ++ for RBDUser. If provided overrides keyring. Default is ++ nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + user: +- description: 'The rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'The rados user name. Default is admin. More ++ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + required: + - 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. + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Default is "xfs". ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Default is "xfs". + type: string + gateway: + description: The host address of the ScaleIO API Gateway. + type: string + protectionDomain: +- description: The name of the ScaleIO Protection Domain for the configured storage. ++ description: The name of the ScaleIO Protection Domain for ++ the configured storage. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretRef: +- description: SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail. ++ description: SecretRef references to the secret for ScaleIO ++ user and other sensitive information. If this is not provided, ++ Login operation will fail. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + sslEnabled: +- description: Flag to enable/disable SSL communication with Gateway, default false ++ description: Flag to enable/disable SSL communication with ++ Gateway, default false + type: boolean + storageMode: +- description: Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned. ++ description: Indicates whether the storage for a volume ++ should be ThickProvisioned or ThinProvisioned. Default ++ is ThinProvisioned. + type: string + storagePool: +- description: The ScaleIO Storage Pool associated with the protection domain. ++ description: The ScaleIO Storage Pool associated with the ++ protection domain. + type: string + system: +- description: The name of the storage system as configured in ScaleIO. ++ description: The name of the storage system as configured ++ in ScaleIO. + type: string + volumeName: +- description: The name of a volume already created in the ScaleIO system that is associated with this volume source. ++ description: The name of a volume already created in the ++ ScaleIO system that is associated with this volume source. + type: string + required: + - gateway +@@ -3096,14 +4725,28 @@ + - system + type: object + secret: +- description: 'Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' ++ description: 'Secret represents a secret that should populate ++ this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: +- description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair in the ++ Data field of the referenced Secret will be projected ++ into the volume as a file whose name is the key and content ++ is the value. If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys will not be ++ present. If a key is specified which is not present in ++ the Secret, the volume setup will error unless it is marked ++ optional. Paths must be relative and may not contain the ++ '..' path or start with '..'. + items: + description: Maps a string key to a path within a volume. + properties: +@@ -3111,11 +4754,19 @@ + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file to map ++ the key to. May not be an absolute path. May not ++ contain the path element '..'. May not start with ++ the string '..'. + type: string + required: + - key +@@ -3123,46 +4774,69 @@ + type: object + type: array + optional: +- description: Specify whether the Secret or its keys must be defined ++ description: Specify whether the Secret or its keys must ++ be defined + type: boolean + secretName: +- description: 'Name of the secret in the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' ++ description: 'Name of the secret in the pod''s namespace ++ to use. 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. + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretRef: +- description: SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted. ++ description: SecretRef specifies the secret to use for obtaining ++ the StorageOS API credentials. If not specified, default ++ values will be attempted. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + volumeName: +- description: VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace. ++ description: VolumeName is the human-readable name of the ++ StorageOS volume. Volume names are only unique within ++ a namespace. + type: string + volumeNamespace: +- description: VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to "default" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created. ++ description: VolumeNamespace specifies the scope of the ++ volume within StorageOS. If no namespace is specified ++ then the Pod's namespace will be used. This allows the ++ Kubernetes name scoping to be mirrored within StorageOS ++ for tighter integration. Set VolumeName to any name to ++ override the default behaviour. Set to "default" if you ++ are not using namespaces within StorageOS. 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 + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + storagePolicyID: +- description: Storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName. ++ description: Storage Policy Based Management (SPBM) profile ++ ID associated with the StoragePolicyName. + type: string + storagePolicyName: +- description: Storage Policy Based Management (SPBM) profile name. ++ description: Storage Policy Based Management (SPBM) profile ++ name. + type: string + volumePath: + description: Path that identifies vSphere volume vmdk +@@ -3176,25 +4850,32 @@ + type: array + type: object + status: +- description: 'Most recent observed status of the Alertmanager cluster. Read-only. Not included when requesting from the apiserver, only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' ++ description: 'Most recent observed status of the Alertmanager cluster. ++ Read-only. Not included when requesting from the apiserver, only from ++ the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + properties: + availableReplicas: +- description: Total number of available pods (ready for at least minReadySeconds) targeted by this Alertmanager cluster. ++ description: Total number of available pods (ready for at least minReadySeconds) ++ targeted by this Alertmanager cluster. + format: int32 + type: integer + paused: +- description: Represents whether any actions on the underlying managed objects are being performed. Only delete actions will be performed. ++ description: Represents whether any actions on the underlying managed ++ objects are being performed. Only delete actions will be performed. + type: boolean + replicas: +- description: Total number of non-terminated pods targeted by this Alertmanager cluster (their labels match the selector). ++ description: Total number of non-terminated pods targeted by this ++ Alertmanager cluster (their labels match the selector). + format: int32 + type: integer + unavailableReplicas: +- description: Total number of unavailable pods targeted by this Alertmanager cluster. ++ description: Total number of unavailable pods targeted by this Alertmanager ++ cluster. + format: int32 + type: integer + updatedReplicas: +- description: Total number of non-terminated pods targeted by this Alertmanager cluster that have the desired version spec. ++ description: Total number of non-terminated pods targeted by this ++ Alertmanager cluster that have the desired version spec. + format: int32 + type: integer + required: diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-podmonitors.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-podmonitors.yaml.patch new file mode 100644 index 000000000..6e5eaa820 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-podmonitors.yaml.patch @@ -0,0 +1,460 @@ +--- charts-original/crds/crd-podmonitors.yaml ++++ charts/crds/crd-podmonitors.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -25,24 +25,31 @@ + description: PodMonitor defines monitoring for a set of pods. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: Specification of desired Pod selection for target discovery by Prometheus. ++ description: Specification of desired Pod selection for target discovery ++ by Prometheus. + properties: + jobLabel: + description: The label to use to retrieve the job name from. + type: string + namespaceSelector: +- description: Selector to select which namespaces the Endpoints objects are discovered from. ++ description: Selector to select which namespaces the Endpoints objects ++ are discovered from. + properties: + any: +- description: Boolean describing whether all namespaces are selected in contrast to a list restricting them. ++ description: Boolean describing whether all namespaces are selected ++ in contrast to a list restricting them. + type: boolean + matchNames: + description: List of namespace names. +@@ -53,94 +60,126 @@ + podMetricsEndpoints: + description: A list of endpoints allowed as part of this PodMonitor. + items: +- description: PodMetricsEndpoint defines a scrapeable endpoint of a Kubernetes Pod serving Prometheus metrics. ++ description: PodMetricsEndpoint defines a scrapeable endpoint of ++ a Kubernetes Pod serving Prometheus metrics. + properties: + basicAuth: +- description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint' ++ description: 'BasicAuth allow an endpoint to authenticate over ++ basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint' + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor namespace ++ that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor namespace ++ that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the pod monitor and accessible by the Prometheus Operator. ++ description: Secret to mount to read bearer token for scraping ++ targets. The secret needs to be in the same namespace as the ++ pod monitor and accessible by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + honorLabels: +- description: HonorLabels chooses the metric's labels on collisions with target labels. ++ description: HonorLabels chooses the metric's labels on collisions ++ with target labels. + type: boolean + honorTimestamps: +- description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. ++ description: HonorTimestamps controls whether Prometheus respects ++ the timestamps present in scraped data. + type: boolean + interval: + description: Interval at which metrics should be scraped + type: string + metricRelabelings: +- description: MetricRelabelConfigs to apply to samples before ingestion. ++ description: MetricRelabelConfigs to apply to samples before ++ ingestion. + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of the ++ label set, being applied to samples before ingestion. It ++ defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex replace ++ is performed if the regular expression matches. Regex ++ capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array +@@ -155,39 +194,58 @@ + description: HTTP path to scrape for metrics. + type: string + port: +- description: Name of the pod port this endpoint refers to. Mutually exclusive with targetPort. ++ description: Name of the pod port this endpoint refers to. Mutually ++ exclusive with targetPort. + type: string + proxyUrl: +- description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint. ++ description: ProxyURL eg http://proxyserver:2195 Directs scrapes ++ to proxy through this endpoint. + type: string + relabelings: +- description: 'RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields and replaces original scrape job name with __tmp_prometheus_job_name. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' ++ description: 'RelabelConfigs to apply to samples before scraping. ++ Prometheus Operator automatically adds relabelings for a few ++ standard Kubernetes fields and replaces original scrape job ++ name with __tmp_prometheus_job_name. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of the ++ label set, being applied to samples before ingestion. It ++ defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex replace ++ is performed if the regular expression matches. Regex ++ capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array +@@ -207,19 +265,24 @@ + description: TLS configuration to use when scraping the endpoint. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -228,32 +291,41 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file for ++ the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -262,13 +334,17 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -278,16 +354,20 @@ + description: Disable target certificate validation. + type: boolean + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -299,30 +379,42 @@ + type: object + type: array + podTargetLabels: +- description: PodTargetLabels transfers labels on the Kubernetes Pod onto the target. ++ description: PodTargetLabels transfers labels on the Kubernetes Pod ++ onto the target. + items: + type: string + type: array + sampleLimit: +- description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. ++ description: SampleLimit defines per-scrape limit on number of scraped ++ samples that will be accepted. + format: int64 + type: integer + selector: + description: Selector to select Pod objects. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -334,11 +426,16 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + targetLimit: +- description: TargetLimit defines a limit on the number of scraped targets that will be accepted. ++ description: TargetLimit defines a limit on the number of scraped ++ targets that will be accepted. + format: int64 + type: integer + required: diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-probes.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-probes.yaml.patch new file mode 100644 index 000000000..90e30b2f9 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-probes.yaml.patch @@ -0,0 +1,425 @@ +--- charts-original/crds/crd-probes.yaml ++++ charts/crds/crd-probes.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -25,58 +25,76 @@ + description: Probe defines monitoring for a set of static targets or ingresses. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: Specification of desired Ingress selection for target discovery by Prometheus. ++ description: Specification of desired Ingress selection for target discovery ++ by Prometheus. + properties: + basicAuth: +- description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint' ++ description: 'BasicAuth allow an endpoint to authenticate over basic ++ authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint' + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor namespace that ++ contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be ++ a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must be ++ defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor namespace that ++ contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be ++ a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must be ++ defined + type: boolean + required: + - key + type: object + type: object + bearerTokenSecret: +- description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the probe and accessible by the Prometheus Operator. ++ description: Secret to mount to read bearer token for scraping targets. ++ The secret needs to be in the same namespace as the probe and accessible ++ by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -85,20 +103,28 @@ + - key + type: object + interval: +- description: Interval at which targets are probed using the configured prober. If not specified Prometheus' global scrape interval is used. ++ description: Interval at which targets are probed using the configured ++ prober. If not specified Prometheus' global scrape interval is used. + type: string + jobName: + description: The job name assigned to scraped metrics by default. + type: string + module: +- description: 'The module to use for probing specifying how to probe the target. Example module configuring in the blackbox exporter: https://github.com/prometheus/blackbox_exporter/blob/master/example.yml' ++ description: 'The module to use for probing specifying how to probe ++ the target. Example module configuring in the blackbox exporter: ++ https://github.com/prometheus/blackbox_exporter/blob/master/example.yml' + type: string + prober: +- description: Specification for the prober to use for probing targets. The prober.URL parameter is required. Targets cannot be probed if left empty. ++ description: Specification for the prober to use for probing targets. ++ The prober.URL parameter is required. Targets cannot be probed if ++ left empty. + properties: + path: + description: Path to collect metrics from. Defaults to `/probe`. + type: string ++ proxyUrl: ++ description: Optional ProxyURL. ++ type: string + scheme: + description: HTTP scheme to use for scraping. Defaults to `http`. + type: string +@@ -112,16 +138,19 @@ + description: Timeout for scraping metrics from the Prometheus exporter. + type: string + targets: +- description: Targets defines a set of static and/or dynamically discovered targets to be probed using the prober. ++ description: Targets defines a set of static and/or dynamically discovered ++ targets to be probed using the prober. + properties: + ingress: +- description: Ingress defines the set of dynamically discovered ingress objects which hosts are considered for probing. ++ description: Ingress defines the set of dynamically discovered ++ ingress objects which hosts are considered for probing. + properties: + namespaceSelector: + description: Select Ingress objects by namespace. + properties: + any: +- description: Boolean describing whether all namespaces are selected in contrast to a list restricting them. ++ description: Boolean describing whether all namespaces ++ are selected in contrast to a list restricting them. + type: boolean + matchNames: + description: List of namespace names. +@@ -130,33 +159,48 @@ + type: array + type: object + relabelingConfigs: +- description: 'RelabelConfigs to apply to samples before ingestion. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' ++ description: 'RelabelConfigs to apply to samples before ingestion. ++ More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of ++ the label set, being applied to samples before ingestion. ++ It defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex ++ replace is performed if the regular expression matches. ++ Regex capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array +@@ -164,18 +208,29 @@ + description: Select Ingress objects by labels. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that ++ relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, NotIn, ++ Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values array ++ must be non-empty. If the operator is Exists or ++ DoesNotExist, the values array must be empty. ++ This array is replaced during a strategic merge ++ patch. + items: + type: string + type: array +@@ -187,51 +242,73 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field is ++ "key", the operator is "In", and the values array contains ++ only "value". The requirements are ANDed. + type: object + type: object + type: object + staticConfig: +- description: 'StaticConfig defines static targets which are considers for probing. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#static_config.' ++ description: 'StaticConfig defines static targets which are considers ++ for probing. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#static_config.' + properties: + labels: + additionalProperties: + type: string +- description: Labels assigned to all metrics scraped from the targets. ++ description: Labels assigned to all metrics scraped from the ++ targets. + type: object + relabelingConfigs: +- description: 'RelabelConfigs to apply to samples before ingestion. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' ++ description: 'RelabelConfigs to apply to samples before ingestion. ++ More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of ++ the label set, being applied to samples before ingestion. ++ It defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex ++ replace is performed if the regular expression matches. ++ Regex capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array + static: +- description: Targets is a list of URLs to probe using the configured prober. ++ description: Targets is a list of URLs to probe using the ++ configured prober. + items: + type: string + type: array +@@ -250,10 +327,12 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its key ++ must be defined + type: boolean + required: + - key +@@ -262,13 +341,16 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -284,10 +366,12 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its key ++ must be defined + type: boolean + required: + - key +@@ -296,13 +380,16 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -315,13 +402,16 @@ + description: Secret containing the client key file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be ++ a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must be ++ defined + type: boolean + required: + - key diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-prometheuses.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-prometheuses.yaml.patch new file mode 100644 index 000000000..a5ebb88bc --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-prometheuses.yaml.patch @@ -0,0 +1,7242 @@ +--- charts-original/crds/crd-prometheuses.yaml ++++ charts/crds/crd-prometheuses.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -37,24 +37,41 @@ + description: Prometheus defines a Prometheus deployment. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: 'Specification of the desired behavior of the Prometheus cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' ++ description: 'Specification of the desired behavior of the Prometheus ++ cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + properties: + additionalAlertManagerConfigs: +- description: 'AdditionalAlertManagerConfigs allows specifying a key of a Secret containing additional Prometheus AlertManager configurations. AlertManager configurations specified are appended to the configurations generated by the Prometheus Operator. Job configurations specified must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config. As AlertManager configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible AlertManager configs are going to break Prometheus after the upgrade.' ++ description: 'AdditionalAlertManagerConfigs allows specifying a key ++ of a Secret containing additional Prometheus AlertManager configurations. ++ AlertManager configurations specified are appended to the configurations ++ generated by the Prometheus Operator. Job configurations specified ++ must have the form as specified in the official Prometheus documentation: ++ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config. ++ As AlertManager configs are appended, the user is responsible to ++ make sure it is valid. Note that using this feature may expose the ++ possibility to break upgrades of Prometheus. It is advised to review ++ Prometheus release notes to ensure that no incompatible AlertManager ++ configs are going to break Prometheus after the upgrade.' + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -63,13 +80,25 @@ + - key + type: object + additionalAlertRelabelConfigs: +- description: 'AdditionalAlertRelabelConfigs allows specifying a key of a Secret containing additional Prometheus alert relabel configurations. Alert relabel configurations specified are appended to the configurations generated by the Prometheus Operator. Alert relabel configurations specified must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs. As alert relabel configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible alert relabel configs are going to break Prometheus after the upgrade.' ++ description: 'AdditionalAlertRelabelConfigs allows specifying a key ++ of a Secret containing additional Prometheus alert relabel configurations. ++ Alert relabel configurations specified are appended to the configurations ++ generated by the Prometheus Operator. Alert relabel configurations ++ specified must have the form as specified in the official Prometheus ++ documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs. ++ As alert relabel configs are appended, the user is responsible to ++ make sure it is valid. Note that using this feature may expose the ++ possibility to break upgrades of Prometheus. It is advised to review ++ Prometheus release notes to ensure that no incompatible alert relabel ++ configs are going to break Prometheus after the upgrade.' + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -78,13 +107,25 @@ + - key + type: object + additionalScrapeConfigs: +- description: 'AdditionalScrapeConfigs allows specifying a key of a Secret containing additional Prometheus scrape configurations. Scrape configurations specified are appended to the configurations generated by the Prometheus Operator. Job configurations specified must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config. As scrape configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible scrape configs are going to break Prometheus after the upgrade.' ++ description: 'AdditionalScrapeConfigs allows specifying a key of a ++ Secret containing additional Prometheus scrape configurations. Scrape ++ configurations specified are appended to the configurations generated ++ by the Prometheus Operator. Job configurations specified must have ++ the form as specified in the official Prometheus documentation: ++ https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config. ++ As scrape configs are appended, the user is responsible to make ++ sure it is valid. Note that using this feature may expose the possibility ++ to break upgrades of Prometheus. It is advised to review Prometheus ++ release notes to ensure that no incompatible scrape configs are ++ going to break Prometheus after the upgrade.' + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -96,29 +137,59 @@ + description: If specified, the pod's scheduling constraints. + properties: + nodeAffinity: +- description: Describes node affinity scheduling rules for the pod. ++ description: Describes node affinity scheduling rules for the ++ pod. + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the affinity expressions specified by ++ this field, but it may choose a node that violates one or ++ more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node matches ++ the corresponding matchExpressions; the node(s) with the ++ highest sum are the most preferred. + items: +- description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op). ++ description: An empty preferred scheduling term matches ++ all objects with implicit weight 0 (i.e. it's a no-op). ++ A null preferred scheduling term matches no objects (i.e. ++ is also a no-op). + properties: + preference: +- description: A node selector term, associated with the corresponding weight. ++ description: A node selector term, associated with the ++ corresponding weight. + properties: + matchExpressions: +- description: A list of node selector requirements by node's labels. ++ description: A list of node selector requirements ++ by node's labels. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -128,18 +199,33 @@ + type: object + type: array + matchFields: +- description: A list of node selector requirements by node's fields. ++ description: A list of node selector requirements ++ by node's fields. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -150,7 +236,8 @@ + type: array + type: object + weight: +- description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. ++ description: Weight associated with matching the corresponding ++ nodeSelectorTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -159,26 +246,50 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node. ++ description: If the affinity requirements specified by this ++ field are not met at scheduling time, the pod will not be ++ scheduled onto the node. If the affinity requirements specified ++ by this field cease to be met at some point during pod execution ++ (e.g. due to an update), the system may or may not try to ++ eventually evict the pod from its node. + properties: + nodeSelectorTerms: +- description: Required. A list of node selector terms. The terms are ORed. ++ description: Required. A list of node selector terms. ++ The terms are ORed. + items: +- description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm. ++ description: A null or empty node selector term matches ++ no objects. The requirements of them are ANDed. The ++ TopologySelectorTerm type implements a subset of the ++ NodeSelectorTerm. + properties: + matchExpressions: +- description: A list of node selector requirements by node's labels. ++ description: A list of node selector requirements ++ by node's labels. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -188,18 +299,33 @@ + type: object + type: array + matchFields: +- description: A list of node selector requirements by node's fields. ++ description: A list of node selector requirements ++ by node's fields. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -215,32 +341,61 @@ + type: object + type: object + podAffinity: +- description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)). ++ description: Describes pod affinity scheduling rules (e.g. co-locate ++ this pod in the same node, zone, etc. as some other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the affinity expressions specified by ++ this field, but it may choose a node that violates one or ++ more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node has ++ pods which matches the corresponding podAffinityTerm; the ++ node(s) with the highest sum are the most preferred. + items: +- description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s) ++ description: The weights of all of the matched WeightedPodAffinityTerm ++ fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: +- description: Required. A pod affinity term, associated with the corresponding weight. ++ description: Required. A pod affinity term, associated ++ with the corresponding weight. + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ++ ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement ++ is a selector that contains values, a key, ++ and an operator that relates the key and ++ values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that ++ the selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's ++ relationship to a set of values. Valid ++ operators are In, NotIn, Exists and ++ DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, ++ the values array must be empty. This ++ array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -252,22 +407,36 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is ++ "In", and the values array contains only "value". ++ The requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces ++ the labelSelector applies to (matches against); ++ null or empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods ++ matching the labelSelector in the specified namespaces, ++ where co-located is defined as running on a node ++ whose value of the label with key topologyKey ++ matches that of any node on which any of the selected ++ pods is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + weight: +- description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. ++ description: weight associated with matching the corresponding ++ podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -276,26 +445,52 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied. ++ description: If the affinity requirements specified by this ++ field are not met at scheduling time, the pod will not be ++ scheduled onto the node. If the affinity requirements specified ++ by this field cease to be met at some point during pod execution ++ (e.g. due to a pod label update), the system may or may ++ not try to eventually evict the pod from its node. When ++ there are multiple elements, the lists of nodes corresponding ++ to each podAffinityTerm are intersected, i.e. all terms ++ must be satisfied. + items: +- description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running ++ description: Defines a set of pods (namely those matching ++ the labelSelector relative to the given namespace(s)) ++ that this pod should be co-located (affinity) or not co-located ++ (anti-affinity) with, where co-located is defined as running ++ on a node whose value of the label with key ++ matches that of any node on which a pod of the set of ++ pods is running + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the ++ selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. If the ++ operator is Exists or DoesNotExist, the ++ values array must be empty. This array is ++ replaced during a strategic merge patch. + items: + type: string + type: array +@@ -307,16 +502,29 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is "In", ++ and the values array contains only "value". The ++ requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces the ++ labelSelector applies to (matches against); null or ++ empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods matching ++ the labelSelector in the specified namespaces, where ++ co-located is defined as running on a node whose value ++ of the label with key topologyKey matches that of ++ any node on which any of the selected pods is running. ++ Empty topologyKey is not allowed. + type: string + required: + - topologyKey +@@ -324,32 +532,62 @@ + type: array + type: object + podAntiAffinity: +- description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)). ++ description: Describes pod anti-affinity scheduling rules (e.g. ++ avoid putting this pod in the same node, zone, etc. as some ++ other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the anti-affinity expressions specified ++ by this field, but it may choose a node that violates one ++ or more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling anti-affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node has ++ pods which matches the corresponding podAffinityTerm; the ++ node(s) with the highest sum are the most preferred. + items: +- description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s) ++ description: The weights of all of the matched WeightedPodAffinityTerm ++ fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: +- description: Required. A pod affinity term, associated with the corresponding weight. ++ description: Required. A pod affinity term, associated ++ with the corresponding weight. + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ++ ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement ++ is a selector that contains values, a key, ++ and an operator that relates the key and ++ values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that ++ the selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's ++ relationship to a set of values. Valid ++ operators are In, NotIn, Exists and ++ DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, ++ the values array must be empty. This ++ array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -361,22 +599,36 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is ++ "In", and the values array contains only "value". ++ The requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces ++ the labelSelector applies to (matches against); ++ null or empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods ++ matching the labelSelector in the specified namespaces, ++ where co-located is defined as running on a node ++ whose value of the label with key topologyKey ++ matches that of any node on which any of the selected ++ pods is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + weight: +- description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. ++ description: weight associated with matching the corresponding ++ podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -385,26 +637,52 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied. ++ description: If the anti-affinity requirements specified by ++ this field are not met at scheduling time, the pod will ++ not be scheduled onto the node. If the anti-affinity requirements ++ specified by this field cease to be met at some point during ++ pod execution (e.g. due to a pod label update), the system ++ may or may not try to eventually evict the pod from its ++ node. When there are multiple elements, the lists of nodes ++ corresponding to each podAffinityTerm are intersected, i.e. ++ all terms must be satisfied. + items: +- description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running ++ description: Defines a set of pods (namely those matching ++ the labelSelector relative to the given namespace(s)) ++ that this pod should be co-located (affinity) or not co-located ++ (anti-affinity) with, where co-located is defined as running ++ on a node whose value of the label with key ++ matches that of any node on which a pod of the set of ++ pods is running + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the ++ selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. If the ++ operator is Exists or DoesNotExist, the ++ values array must be empty. This array is ++ replaced during a strategic merge patch. + items: + type: string + type: array +@@ -416,16 +694,29 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is "In", ++ and the values array contains only "value". The ++ requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces the ++ labelSelector applies to (matches against); null or ++ empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods matching ++ the labelSelector in the specified namespaces, where ++ co-located is defined as running on a node whose value ++ of the label with key topologyKey matches that of ++ any node on which any of the selected pods is running. ++ Empty topologyKey is not allowed. + type: string + required: + - topologyKey +@@ -437,15 +728,20 @@ + description: Define details regarding alerting. + properties: + alertmanagers: +- description: AlertmanagerEndpoints Prometheus should fire alerts against. ++ description: AlertmanagerEndpoints Prometheus should fire alerts ++ against. + items: +- description: AlertmanagerEndpoints defines a selection of a single Endpoints object containing alertmanager IPs to fire alerts against. ++ description: AlertmanagerEndpoints defines a selection of a ++ single Endpoints object containing alertmanager IPs to fire ++ alerts against. + properties: + apiVersion: +- description: Version of the Alertmanager API that Prometheus uses to send alerts. It can be "v1" or "v2". ++ description: Version of the Alertmanager API that Prometheus ++ uses to send alerts. It can be "v1" or "v2". + type: string + bearerTokenFile: +- description: BearerTokenFile to read from filesystem to use when authenticating to Alertmanager. ++ description: BearerTokenFile to read from filesystem to ++ use when authenticating to Alertmanager. + type: string + name: + description: Name of Endpoints object in Namespace. +@@ -454,7 +750,8 @@ + description: Namespace of Endpoints object. + type: string + pathPrefix: +- description: Prefix for the HTTP path alerts are pushed to. ++ description: Prefix for the HTTP path alerts are pushed ++ to. + type: string + port: + anyOf: +@@ -466,102 +763,135 @@ + description: Scheme to use when firing alerts. + type: string + timeout: +- description: Timeout is a per-target Alertmanager timeout when pushing alerts. ++ description: Timeout is a per-target Alertmanager timeout ++ when pushing alerts. + type: string + tlsConfig: + description: TLS Config to use for alertmanager connection. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for ++ the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for ++ the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container ++ to use for the targets. + type: string + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file ++ for the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for ++ the targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + secret: +- description: Secret containing data to use for the targets. ++ description: Secret containing data to use for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select ++ from. Must be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, ++ kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus ++ container for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus ++ container for the targets. + type: string + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for ++ the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key +@@ -580,40 +910,54 @@ + - alertmanagers + type: object + allowOverlappingBlocks: +- description: AllowOverlappingBlocks enables vertical compaction and vertical query merge in Prometheus. This is still experimental in Prometheus so it may change in any upcoming release. ++ description: AllowOverlappingBlocks enables vertical compaction and ++ vertical query merge in Prometheus. This is still experimental in ++ Prometheus so it may change in any upcoming release. + type: boolean + apiserverConfig: +- description: APIServerConfig allows specifying a host and auth methods to access apiserver. If left empty, Prometheus is assumed to run inside of the cluster and will discover API servers automatically and use the pod's CA certificate and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/. ++ description: APIServerConfig allows specifying a host and auth methods ++ to access apiserver. If left empty, Prometheus is assumed to run ++ inside of the cluster and will discover API servers automatically ++ and use the pod's CA certificate and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/. + properties: + basicAuth: +- description: BasicAuth allow an endpoint to authenticate over basic authentication ++ description: BasicAuth allow an endpoint to authenticate over ++ basic authentication + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor namespace that ++ contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor namespace that ++ contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -626,25 +970,31 @@ + description: File to read bearer token for accessing apiserver. + type: string + host: +- description: Host of apiserver. A valid string consisting of a hostname or IP followed by an optional port number ++ description: Host of apiserver. A valid string consisting of a ++ hostname or IP followed by an optional port number + type: string + tlsConfig: + description: TLS Config to use for accessing apiserver. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -653,35 +1003,45 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container ++ to use for the targets. + type: string + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -690,38 +1050,48 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus ++ container for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus ++ container for the targets. + type: string + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -734,47 +1104,87 @@ + - host + type: object + arbitraryFSAccessThroughSMs: +- description: ArbitraryFSAccessThroughSMs configures whether configuration based on a service monitor can access arbitrary files on the file system of the Prometheus container e.g. bearer token files. ++ description: ArbitraryFSAccessThroughSMs configures whether configuration ++ based on a service monitor can access arbitrary files on the file ++ system of the Prometheus container e.g. bearer token files. + properties: + deny: + type: boolean + type: object + baseImage: +- description: 'Base image to use for a Prometheus deployment. Deprecated: use ''image'' instead' ++ description: 'Base image to use for a Prometheus deployment. Deprecated: ++ use ''image'' instead' + type: string + configMaps: +- description: ConfigMaps is a list of ConfigMaps in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods. The ConfigMaps are mounted into /etc/prometheus/configmaps/. ++ description: ConfigMaps is a list of ConfigMaps in the same namespace ++ as the Prometheus object, which shall be mounted into the Prometheus ++ Pods. The ConfigMaps are mounted into /etc/prometheus/configmaps/. + items: + type: string + type: array + containers: +- description: 'Containers allows injecting additional containers or modifying operator generated containers. This can be used to allow adding an authentication proxy to a Prometheus pod or to change the behavior of an operator generated container. Containers described here modify an operator generated container if they share the same name and modifications are done via a strategic merge patch. The current container names are: `prometheus`, `config-reloader`, and `thanos-sidecar`. Overriding containers is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice.' ++ description: 'Containers allows injecting additional containers or ++ modifying operator generated containers. This can be used to allow ++ adding an authentication proxy to a Prometheus pod or to change ++ the behavior of an operator generated container. Containers described ++ here modify an operator generated container if they share the same ++ name and modifications are done via a strategic merge patch. The ++ current container names are: `prometheus`, `config-reloader`, and ++ `thanos-sidecar`. Overriding containers is entirely outside the ++ scope of what the maintainers will support and by doing so, you ++ accept that this behaviour may break at any time without notice.' + items: +- description: A single application container that you want to run within a pod. ++ description: A single application container that you want to run ++ within a pod. + properties: + args: +- description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Arguments to the entrypoint. The docker image''s ++ CMD is used if this is not provided. Variable references $(VAR_NAME) ++ are expanded using the container''s environment. If a variable ++ cannot be resolved, the reference in the input string will ++ be unchanged. The $(VAR_NAME) syntax can be escaped with a ++ double $$, ie: $$(VAR_NAME). Escaped references will never ++ be expanded, regardless of whether the variable exists or ++ not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + command: +- description: 'Entrypoint array. Not executed within a shell. The docker image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Entrypoint array. Not executed within a shell. ++ The docker image''s ENTRYPOINT is used if this is not provided. ++ Variable references $(VAR_NAME) are expanded using the container''s ++ environment. If a variable cannot be resolved, the reference ++ in the input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether the ++ variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + env: +- description: List of environment variables to set in the container. Cannot be updated. ++ description: List of environment variables to set in the container. ++ Cannot be updated. + items: +- description: EnvVar represents an environment variable present in a Container. ++ description: EnvVar represents an environment variable present ++ in a Container. + properties: + name: +- description: Name of the environment variable. Must be a C_IDENTIFIER. ++ description: Name of the environment variable. Must be ++ a C_IDENTIFIER. + type: string + value: +- description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' ++ description: 'Variable references $(VAR_NAME) are expanded ++ using the previous defined environment variables in ++ the container and any service environment variables. ++ If a variable cannot be resolved, the reference in the ++ input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether ++ the variable exists or not. Defaults to "".' + type: string + valueFrom: +- description: Source for the environment variable's value. Cannot be used if value is not empty. ++ description: Source for the environment variable's value. ++ Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. +@@ -783,37 +1193,52 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + fieldRef: +- description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' ++ description: 'Selects a field of the pod: supports ++ metadata.name, metadata.namespace, metadata.labels, ++ metadata.annotations, spec.nodeName, spec.serviceAccountName, ++ status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, limits.ephemeral-storage, requests.cpu, ++ requests.memory and requests.ephemeral-storage) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -823,16 +1248,22 @@ + - resource + type: object + secretKeyRef: +- description: Selects a key of a secret in the pod's namespace ++ description: Selects a key of a secret in the pod's ++ namespace + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -843,28 +1274,41 @@ + type: object + type: array + envFrom: +- description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated. ++ description: List of sources to populate environment variables ++ in the container. The keys defined within a source must be ++ a C_IDENTIFIER. All invalid keys will be reported as an event ++ when the container is starting. When a key exists in multiple ++ sources, the value associated with the last source will take ++ precedence. Values defined by an Env with a duplicate key ++ will take precedence. Cannot be updated. + items: +- description: EnvFromSource represents the source of a set of ConfigMaps ++ description: EnvFromSource represents the source of a set ++ of ConfigMaps + properties: + configMapRef: + description: The ConfigMap to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap must be defined ++ description: Specify whether the ConfigMap must be ++ defined + type: boolean + type: object + prefix: +- description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. ++ description: An optional identifier to prepend to each ++ key in the ConfigMap. Must be a C_IDENTIFIER. + type: string + secretRef: + description: The Secret to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: + description: Specify whether the Secret must be defined +@@ -873,22 +1317,41 @@ + type: object + type: array + image: +- description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' ++ description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images ++ This field is optional to allow higher level config management ++ to default or override container images in workload controllers ++ like Deployments and StatefulSets.' + type: string + imagePullPolicy: +- description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' ++ description: 'Image pull policy. One of Always, Never, IfNotPresent. ++ Defaults to Always if :latest tag is specified, or IfNotPresent ++ otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' + type: string + lifecycle: +- description: Actions that the management system should take in response to container lifecycle events. Cannot be updated. ++ description: Actions that the management system should take ++ in response to container lifecycle events. Cannot be updated. + properties: + postStart: +- description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PostStart is called immediately after a container ++ is created. If the handler fails, the container is terminated ++ and restarted according to its restart policy. 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: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -897,12 +1360,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -922,38 +1389,66 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + type: object + preStop: +- description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The reason for termination is passed to the handler. The Pod''s termination grace period countdown begins before the PreStop hooked is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period. Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PreStop is called immediately before a container ++ is terminated due to an API request or management event ++ such as liveness/startup probe failure, preemption, resource ++ contention, etc. The handler is not called if the container ++ crashes or exits. The reason for termination is passed ++ to the handler. The Pod''s termination grace period countdown ++ begins before the PreStop hooked is executed. Regardless ++ of the outcome of the handler, the container will eventually ++ terminate within the Pod''s termination grace period. ++ Other management of the container blocks until the hook ++ completes or until the termination grace period is reached. ++ More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -962,12 +1457,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -987,25 +1486,33 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port +@@ -1013,31 +1520,47 @@ + type: object + type: object + livenessProbe: +- description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container liveness. Container ++ will be restarted if the probe fails. Cannot be updated. More ++ info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1057,71 +1580,104 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + name: +- description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated. ++ description: Name of the container specified as a DNS_LABEL. ++ Each container in a pod must have a unique name (DNS_LABEL). ++ Cannot be updated. + type: string + ports: +- description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. ++ description: List of ports to expose from the container. Exposing ++ a port here gives the system additional information about ++ the network connections a container uses, but is primarily ++ informational. Not specifying a port here DOES NOT prevent ++ that port from being exposed. Any port which is listening ++ on the default "0.0.0.0" address inside a container will be ++ accessible from the network. Cannot be updated. + items: +- description: ContainerPort represents a network port in a single container. ++ description: ContainerPort represents a network port in a ++ single container. + properties: + containerPort: +- description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536. ++ description: Number of port to expose on the pod's IP ++ address. This must be a valid port number, 0 < x < 65536. + format: int32 + type: integer + hostIP: + description: What host IP to bind the external port to. + type: string + hostPort: +- description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. ++ description: Number of port to expose on the host. If ++ specified, this must be a valid port number, 0 < x < ++ 65536. If HostNetwork is specified, this must match ++ ContainerPort. Most containers do not need this. + format: int32 + type: integer + name: +- description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. ++ description: If specified, this must be an IANA_SVC_NAME ++ and unique within the pod. Each named port in a pod ++ must have a unique name. Name for the port that can ++ be referred to by services. + type: string + protocol: + default: TCP +- description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP". ++ description: Protocol for port. Must be UDP, TCP, or SCTP. ++ Defaults to "TCP". + type: string + required: + - containerPort +@@ -1132,31 +1688,47 @@ + - protocol + x-kubernetes-list-type: map + readinessProbe: +- description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container service readiness. ++ Container will be removed from service endpoints if the probe ++ fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1176,48 +1748,65 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + resources: +- description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Compute Resources required by this container. ++ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + properties: + limits: + additionalProperties: +@@ -1226,7 +1815,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -1235,107 +1825,187 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, ++ otherwise to an implementation-defined value. More info: ++ https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + securityContext: +- description: 'Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' ++ description: 'Security options the pod should run with. More ++ info: https://kubernetes.io/docs/concepts/policy/security-context/ ++ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' + properties: + allowPrivilegeEscalation: +- description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN' ++ description: 'AllowPrivilegeEscalation controls whether ++ a process can gain more privileges than its parent process. ++ This bool directly controls if the no_new_privs flag will ++ be set on the container process. AllowPrivilegeEscalation ++ is true always when the container is: 1) run as Privileged ++ 2) has CAP_SYS_ADMIN' + type: boolean + capabilities: +- description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. ++ description: The capabilities to add/drop when running containers. ++ Defaults to the default set of capabilities granted by ++ the container runtime. + properties: + add: + description: Added capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + drop: + description: Removed capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + type: object + privileged: +- description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. ++ description: Run container in privileged mode. Processes ++ in privileged containers are essentially equivalent to ++ root on the host. Defaults to false. + type: boolean + procMount: +- description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. ++ description: procMount denotes the type of proc mount to ++ use for the containers. The default is DefaultProcMount ++ which uses the container runtime defaults for readonly ++ paths and masked paths. This requires the ProcMountType ++ feature flag to be enabled. + type: string + readOnlyRootFilesystem: +- description: Whether this container has a read-only root filesystem. Default is false. ++ description: Whether this container has a read-only root ++ filesystem. Default is false. + type: boolean + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The GID to run the entrypoint of the container ++ process. Uses runtime default if unset. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a ++ non-root user. If true, the Kubelet will validate the ++ image at runtime to ensure that it does not run as UID ++ 0 (root) and fail to start the container if it does. If ++ unset or false, no such validation will be performed. ++ May also be set in PodSecurityContext. If set in both ++ SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UID to run the entrypoint of the container ++ process. Defaults to user specified in image metadata ++ if unspecified. May also be set in PodSecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The SELinux context to be applied to the container. ++ If unspecified, the container runtime will allocate a ++ random SELinux context for each container. May also be ++ set in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies ++ to the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies ++ to the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies ++ to the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies ++ to the container. + type: string + type: object + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all ++ containers. If unspecified, the options from the PodSecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named ++ by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the ++ GMSA credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + type: string + type: object + type: object + startupProbe: +- description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. This is a beta feature enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'StartupProbe indicates that the Pod has successfully ++ initialized. If specified, no other probes are executed until ++ this completes successfully. If this probe fails, the Pod ++ will be restarted, just as if the livenessProbe failed. This ++ can be used to provide different probe parameters at the beginning ++ of a Pod''s lifecycle, when it might take a long time to load ++ data or warm a cache, than during steady-state operation. ++ This cannot be updated. This is a beta feature enabled by ++ the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1355,71 +2025,117 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + stdin: +- description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false. ++ description: Whether this container should allocate a buffer ++ for stdin in the container runtime. If this is not set, reads ++ from stdin in the container will always result in EOF. Default ++ is false. + type: boolean + stdinOnce: +- description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false ++ description: Whether the container runtime should close the ++ stdin channel after it has been opened by a single attach. ++ When stdin is true the stdin stream will remain open across ++ multiple attach sessions. If stdinOnce is set to true, stdin ++ is opened on container start, is empty until the first client ++ attaches to stdin, and then remains open and accepts data ++ until the client disconnects, at which time stdin is closed ++ and remains closed until the container is restarted. If this ++ flag is false, a container processes that reads from stdin ++ will never receive an EOF. Default is false + type: boolean + terminationMessagePath: +- description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.' ++ description: 'Optional: Path at which the file to which the ++ container''s termination message will be written is mounted ++ into the container''s filesystem. Message written is intended ++ to be brief final status, such as an assertion failure message. ++ Will be truncated by the node if greater than 4096 bytes. ++ The total message length across all containers will be limited ++ to 12kb. Defaults to /dev/termination-log. Cannot be updated.' + type: string + terminationMessagePolicy: +- description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated. ++ description: Indicate how the termination message should be ++ populated. File will use the contents of terminationMessagePath ++ to populate the container status message on both success and ++ failure. FallbackToLogsOnError will use the last chunk of ++ container log output if the termination message file is empty ++ and the container exited with an error. The log output is ++ limited to 2048 bytes or 80 lines, whichever is smaller. Defaults ++ to File. Cannot be updated. + type: string + tty: +- description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false. ++ description: Whether this container should allocate a TTY for ++ itself, also requires 'stdin' to be true. Default is false. + type: boolean + volumeDevices: +- description: volumeDevices is the list of block devices to be used by the container. ++ description: volumeDevices is the list of block devices to be ++ used by the container. + items: +- description: volumeDevice describes a mapping of a raw block device within a container. ++ description: volumeDevice describes a mapping of a raw block ++ device within a container. + properties: + devicePath: +- description: devicePath is the path inside of the container that the device will be mapped to. ++ description: devicePath is the path inside of the container ++ that the device will be mapped to. + type: string + name: +- description: name must match the name of a persistentVolumeClaim in the pod ++ description: name must match the name of a persistentVolumeClaim ++ in the pod + type: string + required: + - devicePath +@@ -1427,27 +2143,40 @@ + type: object + type: array + volumeMounts: +- description: Pod volumes to mount into the container's filesystem. Cannot be updated. ++ description: Pod volumes to mount into the container's filesystem. ++ Cannot be updated. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume ++ within a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume ++ should be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are ++ propagated from the host to container and the other ++ way around. When not set, MountPropagationNone is used. ++ This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which ++ the container's volume should be mounted. Behaves similarly ++ to SubPath but environment variable references $(VAR_NAME) ++ are expanded using the container's environment. Defaults ++ to "" (volume's root). SubPathExpr and SubPath are mutually ++ exclusive. + type: string + required: + - mountPath +@@ -1455,7 +2184,9 @@ + type: object + type: array + workingDir: +- description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated. ++ description: Container's working directory. If not specified, ++ the container runtime's default will be used, which might ++ be configured in the container image. Cannot be updated. + type: string + required: + - name +@@ -1465,79 +2196,154 @@ + description: Disable prometheus compaction. + type: boolean + enableAdminAPI: +- description: 'Enable access to prometheus web admin API. Defaults to the value of `false`. WARNING: Enabling the admin APIs enables mutating endpoints, to delete data, shutdown Prometheus, and more. Enabling this should be done with care and the user is advised to add additional authentication authorization via a proxy to ensure only clients authorized to perform these actions can do so. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis' ++ description: 'Enable access to prometheus web admin API. Defaults ++ to the value of `false`. WARNING: Enabling the admin APIs enables ++ mutating endpoints, to delete data, shutdown Prometheus, and more. ++ Enabling this should be done with care and the user is advised to ++ add additional authentication authorization via a proxy to ensure ++ only clients authorized to perform these actions can do so. For ++ more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis' + type: boolean + enableFeatures: +- description: Enable access to Prometheus disabled features. By default, no features are enabled. Enabling disabled features is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice. For more information see https://prometheus.io/docs/prometheus/latest/disabled_features/ ++ description: Enable access to Prometheus disabled features. By default, ++ no features are enabled. Enabling disabled features is entirely ++ outside the scope of what the maintainers will support and by doing ++ so, you accept that this behaviour may break at any time without ++ notice. For more information see https://prometheus.io/docs/prometheus/latest/disabled_features/ + items: + type: string + type: array + enforcedNamespaceLabel: +- description: EnforcedNamespaceLabel enforces adding a namespace label of origin for each alert and metric that is user created. The label value will always be the namespace of the object that is being created. ++ description: "EnforcedNamespaceLabel If set, a label will be added ++ to \n 1. all user-metrics (created by `ServiceMonitor`, `PodMonitor` ++ and `ProbeConfig` object) and 2. in all `PrometheusRule` objects ++ (except the ones excluded in `prometheusRulesExcludedFromEnforce`) ++ to * alerting & recording rules and * the metrics used in ++ their expressions (`expr`). \n Label name is this field's value. ++ Label value is the namespace of the created object (mentioned above)." + type: string + enforcedSampleLimit: +- description: EnforcedSampleLimit defines global limit on number of scraped samples that will be accepted. This overrides any SampleLimit set per ServiceMonitor or/and PodMonitor. It is meant to be used by admins to enforce the SampleLimit to keep overall number of samples/series under the desired limit. Note that if SampleLimit is lower that value will be taken instead. ++ description: EnforcedSampleLimit defines global limit on number of ++ scraped samples that will be accepted. This overrides any SampleLimit ++ set per ServiceMonitor or/and PodMonitor. It is meant to be used ++ by admins to enforce the SampleLimit to keep overall number of samples/series ++ under the desired limit. Note that if SampleLimit is lower that ++ value will be taken instead. + format: int64 + type: integer + enforcedTargetLimit: +- description: EnforcedTargetLimit defines a global limit on the number of scraped targets. This overrides any TargetLimit set per ServiceMonitor or/and PodMonitor. It is meant to be used by admins to enforce the TargetLimit to keep overall number of targets under the desired limit. Note that if TargetLimit is higher that value will be taken instead. ++ description: EnforcedTargetLimit defines a global limit on the number ++ of scraped targets. This overrides any TargetLimit set per ServiceMonitor ++ or/and PodMonitor. It is meant to be used by admins to enforce the ++ TargetLimit to keep overall number of targets under the desired ++ limit. Note that if TargetLimit is higher that value will be taken ++ instead. + format: int64 + type: integer + evaluationInterval: +- description: Interval between consecutive evaluations. ++ description: 'Interval between consecutive evaluations. Default: `1m`' + type: string + externalLabels: + additionalProperties: + type: string +- description: The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). ++ description: The labels to add to any time series or alerts when communicating ++ with external systems (federation, remote storage, Alertmanager). + type: object + externalUrl: +- description: The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. ++ description: The external URL the Prometheus instances will be available ++ under. This is necessary to generate correct URLs. This is necessary ++ if Prometheus is not served from root of a DNS name. + type: string + ignoreNamespaceSelectors: +- description: IgnoreNamespaceSelectors if set to true will ignore NamespaceSelector settings from the podmonitor and servicemonitor configs, and they will only discover endpoints within their current namespace. Defaults to false. ++ description: IgnoreNamespaceSelectors if set to true will ignore NamespaceSelector ++ settings from the podmonitor and servicemonitor configs, and they ++ will only discover endpoints within their current namespace. Defaults ++ to false. + type: boolean + image: +- description: Image if specified has precedence over baseImage, tag and sha combinations. Specifying the version is still necessary to ensure the Prometheus Operator knows what version of Prometheus is being configured. ++ description: Image if specified has precedence over baseImage, tag ++ and sha combinations. Specifying the version is still necessary ++ to ensure the Prometheus Operator knows what version of Prometheus ++ is being configured. + type: string + imagePullSecrets: +- description: An optional list of references to secrets in the same namespace to use for pulling prometheus and alertmanager images from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod ++ description: An optional list of references to secrets in the same ++ namespace to use for pulling prometheus and alertmanager images ++ from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod + items: +- description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace. ++ description: LocalObjectReference contains enough information to ++ let you locate the referenced object inside the same namespace. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + type: array + initContainers: +- description: 'InitContainers allows adding initContainers to the pod definition. Those can be used to e.g. fetch secrets for injection into the Prometheus configuration from external sources. Any errors during the execution of an initContainer will lead to a restart of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ Using initContainers for any use case other then secret fetching is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice.' ++ description: 'InitContainers allows adding initContainers to the pod ++ definition. Those can be used to e.g. fetch secrets for injection ++ into the Prometheus configuration from external sources. Any errors ++ during the execution of an initContainer will lead to a restart ++ of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ++ InitContainers described here modify an operator generated init ++ containers if they share the same name and modifications are done ++ via a strategic merge patch. The current init container name is: ++ `init-config-reloader`. Overriding init containers is entirely outside ++ the scope of what the maintainers will support and by doing so, ++ you accept that this behaviour may break at any time without notice.' + items: +- description: A single application container that you want to run within a pod. ++ description: A single application container that you want to run ++ within a pod. + properties: + args: +- description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Arguments to the entrypoint. The docker image''s ++ CMD is used if this is not provided. Variable references $(VAR_NAME) ++ are expanded using the container''s environment. If a variable ++ cannot be resolved, the reference in the input string will ++ be unchanged. The $(VAR_NAME) syntax can be escaped with a ++ double $$, ie: $$(VAR_NAME). Escaped references will never ++ be expanded, regardless of whether the variable exists or ++ not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + command: +- description: 'Entrypoint array. Not executed within a shell. The docker image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Entrypoint array. Not executed within a shell. ++ The docker image''s ENTRYPOINT is used if this is not provided. ++ Variable references $(VAR_NAME) are expanded using the container''s ++ environment. If a variable cannot be resolved, the reference ++ in the input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether the ++ variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + env: +- description: List of environment variables to set in the container. Cannot be updated. ++ description: List of environment variables to set in the container. ++ Cannot be updated. + items: +- description: EnvVar represents an environment variable present in a Container. ++ description: EnvVar represents an environment variable present ++ in a Container. + properties: + name: +- description: Name of the environment variable. Must be a C_IDENTIFIER. ++ description: Name of the environment variable. Must be ++ a C_IDENTIFIER. + type: string + value: +- description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' ++ description: 'Variable references $(VAR_NAME) are expanded ++ using the previous defined environment variables in ++ the container and any service environment variables. ++ If a variable cannot be resolved, the reference in the ++ input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether ++ the variable exists or not. Defaults to "".' + type: string + valueFrom: +- description: Source for the environment variable's value. Cannot be used if value is not empty. ++ description: Source for the environment variable's value. ++ Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. +@@ -1546,37 +2352,52 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + fieldRef: +- description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' ++ description: 'Selects a field of the pod: supports ++ metadata.name, metadata.namespace, metadata.labels, ++ metadata.annotations, spec.nodeName, spec.serviceAccountName, ++ status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, limits.ephemeral-storage, requests.cpu, ++ requests.memory and requests.ephemeral-storage) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -1586,16 +2407,22 @@ + - resource + type: object + secretKeyRef: +- description: Selects a key of a secret in the pod's namespace ++ description: Selects a key of a secret in the pod's ++ namespace + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1606,28 +2433,41 @@ + type: object + type: array + envFrom: +- description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated. ++ description: List of sources to populate environment variables ++ in the container. The keys defined within a source must be ++ a C_IDENTIFIER. All invalid keys will be reported as an event ++ when the container is starting. When a key exists in multiple ++ sources, the value associated with the last source will take ++ precedence. Values defined by an Env with a duplicate key ++ will take precedence. Cannot be updated. + items: +- description: EnvFromSource represents the source of a set of ConfigMaps ++ description: EnvFromSource represents the source of a set ++ of ConfigMaps + properties: + configMapRef: + description: The ConfigMap to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap must be defined ++ description: Specify whether the ConfigMap must be ++ defined + type: boolean + type: object + prefix: +- description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. ++ description: An optional identifier to prepend to each ++ key in the ConfigMap. Must be a C_IDENTIFIER. + type: string + secretRef: + description: The Secret to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: + description: Specify whether the Secret must be defined +@@ -1636,22 +2476,41 @@ + type: object + type: array + image: +- description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' ++ description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images ++ This field is optional to allow higher level config management ++ to default or override container images in workload controllers ++ like Deployments and StatefulSets.' + type: string + imagePullPolicy: +- description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' ++ description: 'Image pull policy. One of Always, Never, IfNotPresent. ++ Defaults to Always if :latest tag is specified, or IfNotPresent ++ otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' + type: string + lifecycle: +- description: Actions that the management system should take in response to container lifecycle events. Cannot be updated. ++ description: Actions that the management system should take ++ in response to container lifecycle events. Cannot be updated. + properties: + postStart: +- description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PostStart is called immediately after a container ++ is created. If the handler fails, the container is terminated ++ and restarted according to its restart policy. 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: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -1660,12 +2519,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1685,38 +2548,66 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + type: object + preStop: +- description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The reason for termination is passed to the handler. The Pod''s termination grace period countdown begins before the PreStop hooked is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period. Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PreStop is called immediately before a container ++ is terminated due to an API request or management event ++ such as liveness/startup probe failure, preemption, resource ++ contention, etc. The handler is not called if the container ++ crashes or exits. The reason for termination is passed ++ to the handler. The Pod''s termination grace period countdown ++ begins before the PreStop hooked is executed. Regardless ++ of the outcome of the handler, the container will eventually ++ terminate within the Pod''s termination grace period. ++ Other management of the container blocks until the hook ++ completes or until the termination grace period is reached. ++ More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -1725,12 +2616,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1750,25 +2645,33 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port +@@ -1776,31 +2679,47 @@ + type: object + type: object + livenessProbe: +- description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container liveness. Container ++ will be restarted if the probe fails. Cannot be updated. More ++ info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1820,71 +2739,104 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + name: +- description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated. ++ description: Name of the container specified as a DNS_LABEL. ++ Each container in a pod must have a unique name (DNS_LABEL). ++ Cannot be updated. + type: string + ports: +- description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. ++ description: List of ports to expose from the container. Exposing ++ a port here gives the system additional information about ++ the network connections a container uses, but is primarily ++ informational. Not specifying a port here DOES NOT prevent ++ that port from being exposed. Any port which is listening ++ on the default "0.0.0.0" address inside a container will be ++ accessible from the network. Cannot be updated. + items: +- description: ContainerPort represents a network port in a single container. ++ description: ContainerPort represents a network port in a ++ single container. + properties: + containerPort: +- description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536. ++ description: Number of port to expose on the pod's IP ++ address. This must be a valid port number, 0 < x < 65536. + format: int32 + type: integer + hostIP: + description: What host IP to bind the external port to. + type: string + hostPort: +- description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. ++ description: Number of port to expose on the host. If ++ specified, this must be a valid port number, 0 < x < ++ 65536. If HostNetwork is specified, this must match ++ ContainerPort. Most containers do not need this. + format: int32 + type: integer + name: +- description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. ++ description: If specified, this must be an IANA_SVC_NAME ++ and unique within the pod. Each named port in a pod ++ must have a unique name. Name for the port that can ++ be referred to by services. + type: string + protocol: + default: TCP +- description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP". ++ description: Protocol for port. Must be UDP, TCP, or SCTP. ++ Defaults to "TCP". + type: string + required: + - containerPort +@@ -1895,31 +2847,47 @@ + - protocol + x-kubernetes-list-type: map + readinessProbe: +- description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container service readiness. ++ Container will be removed from service endpoints if the probe ++ fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1939,48 +2907,65 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + resources: +- description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Compute Resources required by this container. ++ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + properties: + limits: + additionalProperties: +@@ -1989,7 +2974,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -1998,107 +2984,187 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, ++ otherwise to an implementation-defined value. More info: ++ https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + securityContext: +- description: 'Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' ++ description: 'Security options the pod should run with. More ++ info: https://kubernetes.io/docs/concepts/policy/security-context/ ++ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' + properties: + allowPrivilegeEscalation: +- description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN' ++ description: 'AllowPrivilegeEscalation controls whether ++ a process can gain more privileges than its parent process. ++ This bool directly controls if the no_new_privs flag will ++ be set on the container process. AllowPrivilegeEscalation ++ is true always when the container is: 1) run as Privileged ++ 2) has CAP_SYS_ADMIN' + type: boolean + capabilities: +- description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. ++ description: The capabilities to add/drop when running containers. ++ Defaults to the default set of capabilities granted by ++ the container runtime. + properties: + add: + description: Added capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + drop: + description: Removed capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + type: object + privileged: +- description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. ++ description: Run container in privileged mode. Processes ++ in privileged containers are essentially equivalent to ++ root on the host. Defaults to false. + type: boolean + procMount: +- description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. ++ description: procMount denotes the type of proc mount to ++ use for the containers. The default is DefaultProcMount ++ which uses the container runtime defaults for readonly ++ paths and masked paths. This requires the ProcMountType ++ feature flag to be enabled. + type: string + readOnlyRootFilesystem: +- description: Whether this container has a read-only root filesystem. Default is false. ++ description: Whether this container has a read-only root ++ filesystem. Default is false. + type: boolean + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The GID to run the entrypoint of the container ++ process. Uses runtime default if unset. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a ++ non-root user. If true, the Kubelet will validate the ++ image at runtime to ensure that it does not run as UID ++ 0 (root) and fail to start the container if it does. If ++ unset or false, no such validation will be performed. ++ May also be set in PodSecurityContext. If set in both ++ SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UID to run the entrypoint of the container ++ process. Defaults to user specified in image metadata ++ if unspecified. May also be set in PodSecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The SELinux context to be applied to the container. ++ If unspecified, the container runtime will allocate a ++ random SELinux context for each container. May also be ++ set in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies ++ to the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies ++ to the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies ++ to the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies ++ to the container. + type: string + type: object + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all ++ containers. If unspecified, the options from the PodSecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named ++ by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the ++ GMSA credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + type: string + type: object + type: object + startupProbe: +- description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. This is a beta feature enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'StartupProbe indicates that the Pod has successfully ++ initialized. If specified, no other probes are executed until ++ this completes successfully. If this probe fails, the Pod ++ will be restarted, just as if the livenessProbe failed. This ++ can be used to provide different probe parameters at the beginning ++ of a Pod''s lifecycle, when it might take a long time to load ++ data or warm a cache, than during steady-state operation. ++ This cannot be updated. This is a beta feature enabled by ++ the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -2118,71 +3184,117 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + stdin: +- description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false. ++ description: Whether this container should allocate a buffer ++ for stdin in the container runtime. If this is not set, reads ++ from stdin in the container will always result in EOF. Default ++ is false. + type: boolean + stdinOnce: +- description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false ++ description: Whether the container runtime should close the ++ stdin channel after it has been opened by a single attach. ++ When stdin is true the stdin stream will remain open across ++ multiple attach sessions. If stdinOnce is set to true, stdin ++ is opened on container start, is empty until the first client ++ attaches to stdin, and then remains open and accepts data ++ until the client disconnects, at which time stdin is closed ++ and remains closed until the container is restarted. If this ++ flag is false, a container processes that reads from stdin ++ will never receive an EOF. Default is false + type: boolean + terminationMessagePath: +- description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.' ++ description: 'Optional: Path at which the file to which the ++ container''s termination message will be written is mounted ++ into the container''s filesystem. Message written is intended ++ to be brief final status, such as an assertion failure message. ++ Will be truncated by the node if greater than 4096 bytes. ++ The total message length across all containers will be limited ++ to 12kb. Defaults to /dev/termination-log. Cannot be updated.' + type: string + terminationMessagePolicy: +- description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated. ++ description: Indicate how the termination message should be ++ populated. File will use the contents of terminationMessagePath ++ to populate the container status message on both success and ++ failure. FallbackToLogsOnError will use the last chunk of ++ container log output if the termination message file is empty ++ and the container exited with an error. The log output is ++ limited to 2048 bytes or 80 lines, whichever is smaller. Defaults ++ to File. Cannot be updated. + type: string + tty: +- description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false. ++ description: Whether this container should allocate a TTY for ++ itself, also requires 'stdin' to be true. Default is false. + type: boolean + volumeDevices: +- description: volumeDevices is the list of block devices to be used by the container. ++ description: volumeDevices is the list of block devices to be ++ used by the container. + items: +- description: volumeDevice describes a mapping of a raw block device within a container. ++ description: volumeDevice describes a mapping of a raw block ++ device within a container. + properties: + devicePath: +- description: devicePath is the path inside of the container that the device will be mapped to. ++ description: devicePath is the path inside of the container ++ that the device will be mapped to. + type: string + name: +- description: name must match the name of a persistentVolumeClaim in the pod ++ description: name must match the name of a persistentVolumeClaim ++ in the pod + type: string + required: + - devicePath +@@ -2190,27 +3302,40 @@ + type: object + type: array + volumeMounts: +- description: Pod volumes to mount into the container's filesystem. Cannot be updated. ++ description: Pod volumes to mount into the container's filesystem. ++ Cannot be updated. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume ++ within a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume ++ should be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are ++ propagated from the host to container and the other ++ way around. When not set, MountPropagationNone is used. ++ This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which ++ the container's volume should be mounted. Behaves similarly ++ to SubPath but environment variable references $(VAR_NAME) ++ are expanded using the container's environment. Defaults ++ to "" (volume's root). SubPathExpr and SubPath are mutually ++ exclusive. + type: string + required: + - mountPath +@@ -2218,14 +3343,17 @@ + type: object + type: array + workingDir: +- description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated. ++ description: Container's working directory. If not specified, ++ the container runtime's default will be used, which might ++ be configured in the container image. Cannot be updated. + type: string + required: + - name + type: object + type: array + listenLocal: +- description: ListenLocal makes the Prometheus server listen on loopback, so that it does not bind against the Pod IP. ++ description: ListenLocal makes the Prometheus server listen on loopback, ++ so that it does not bind against the Pod IP. + type: boolean + logFormat: + description: Log format for Prometheus to be configured with. +@@ -2239,47 +3367,73 @@ + description: Define which Nodes the Pods are scheduled on. + type: object + overrideHonorLabels: +- description: OverrideHonorLabels if set to true overrides all user configured honor_labels. If HonorLabels is set in ServiceMonitor or PodMonitor to true, this overrides honor_labels to false. ++ description: OverrideHonorLabels if set to true overrides all user ++ configured honor_labels. If HonorLabels is set in ServiceMonitor ++ or PodMonitor to true, this overrides honor_labels to false. + type: boolean + overrideHonorTimestamps: +- description: OverrideHonorTimestamps allows to globally enforce honoring timestamps in all scrape configs. ++ description: OverrideHonorTimestamps allows to globally enforce honoring ++ timestamps in all scrape configs. + type: boolean + paused: +- description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. ++ description: When a Prometheus deployment is paused, no actions except ++ for deletion will be performed on the underlying objects. + type: boolean + podMetadata: +- description: PodMetadata configures Labels and Annotations which are propagated to the prometheus pods. ++ description: PodMetadata configures Labels and Annotations which are ++ propagated to the prometheus pods. + properties: + annotations: + additionalProperties: + type: string +- description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' ++ description: 'Annotations is an unstructured key value map stored ++ with a resource that may be set by external tools to store and ++ retrieve arbitrary metadata. They are not queryable and should ++ be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string +- description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' ++ description: 'Map of string keys and values that can be used to ++ organize and categorize (scope and select) objects. May match ++ selectors of replication controllers and services. More info: ++ http://kubernetes.io/docs/user-guide/labels' + type: object + name: +- description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' ++ description: 'Name must be unique within a namespace. Is required ++ when creating resources, although some resources may allow a ++ client to request the generation of an appropriate name automatically. ++ Name is primarily intended for creation idempotence and configuration ++ definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + type: object + podMonitorNamespaceSelector: +- description: Namespace's labels to match for PodMonitor discovery. If nil, only check own namespace. ++ description: Namespace's labels to match for PodMonitor discovery. ++ If nil, only check own namespace. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2291,25 +3445,41 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + podMonitorSelector: +- description: '*Experimental* PodMonitors to be selected for target discovery. *Deprecated:* if neither this nor serviceMonitorSelector are specified, configuration is unmanaged.' ++ description: '*Experimental* PodMonitors to be selected for target ++ discovery. *Deprecated:* if neither this nor serviceMonitorSelector ++ are specified, configuration is unmanaged.' + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2321,31 +3491,47 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + portName: +- description: Port name used for the pods and governing service. This defaults to web ++ description: Port name used for the pods and governing service. This ++ defaults to web + type: string + priorityClassName: + description: Priority class assigned to the Pods + type: string + probeNamespaceSelector: +- description: '*Experimental* Namespaces to be selected for Probe discovery. If nil, only check own namespace.' ++ description: '*Experimental* Namespaces to be selected for Probe discovery. ++ If nil, only check own namespace.' + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2357,25 +3543,39 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + probeSelector: + description: '*Experimental* Probes to be selected for target discovery.' + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2387,16 +3587,27 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + prometheusExternalLabelName: +- description: Name of Prometheus external label used to denote Prometheus instance name. Defaults to the value of `prometheus`. External label will _not_ be added when value is set to empty string (`""`). ++ description: Name of Prometheus external label used to denote Prometheus ++ instance name. Defaults to the value of `prometheus`. External label ++ will _not_ be added when value is set to empty string (`""`). + type: string + prometheusRulesExcludedFromEnforce: +- description: PrometheusRulesExcludedFromEnforce - list of prometheus rules to be excluded from enforcing of adding namespace labels. Works only if enforcedNamespaceLabel set to true. Make sure both ruleNamespace and ruleName are set for each pair ++ description: PrometheusRulesExcludedFromEnforce - list of prometheus ++ rules to be excluded from enforcing of adding namespace labels. ++ Works only if enforcedNamespaceLabel set to true. Make sure both ++ ruleNamespace and ruleName are set for each pair + items: +- description: PrometheusRuleExcludeConfig enables users to configure excluded PrometheusRule names and their namespaces to be ignored while enforcing namespace label for alerts and metrics. ++ description: PrometheusRuleExcludeConfig enables users to configure ++ excluded PrometheusRule names and their namespaces to be ignored ++ while enforcing namespace label for alerts and metrics. + properties: + ruleName: + description: RuleNamespace - name of excluded rule +@@ -2410,17 +3621,22 @@ + type: object + type: array + query: +- description: QuerySpec defines the query command line flags when starting Prometheus. ++ description: QuerySpec defines the query command line flags when starting ++ Prometheus. + properties: + lookbackDelta: +- description: The delta difference allowed for retrieving metrics during expression evaluations. ++ description: The delta difference allowed for retrieving metrics ++ during expression evaluations. + type: string + maxConcurrency: + description: Number of concurrent queries that can be run at once. + format: int32 + type: integer + maxSamples: +- description: Maximum number of samples a single query can load into memory. Note that queries will fail if they would load more samples than this into memory, so this also limits the number of samples a query can return. ++ description: Maximum number of samples a single query can load ++ into memory. Note that queries will fail if they would load ++ more samples than this into memory, so this also limits the ++ number of samples a query can return. + format: int32 + type: integer + timeout: +@@ -2428,42 +3644,58 @@ + type: string + type: object + queryLogFile: +- description: QueryLogFile specifies the file to which PromQL queries are logged. Note that this location must be writable, and can be persisted using an attached volume. Alternatively, the location can be set to a stdout location such as `/dev/stdout` to log querie information to the default Prometheus log stream. This is only available in versions of Prometheus >= 2.16.0. For more details, see the Prometheus docs (https://prometheus.io/docs/guides/query-log/) ++ description: QueryLogFile specifies the file to which PromQL queries ++ are logged. Note that this location must be writable, and can be ++ persisted using an attached volume. Alternatively, the location ++ can be set to a stdout location such as `/dev/stdout` to log querie ++ information to the default Prometheus log stream. This is only available ++ in versions of Prometheus >= 2.16.0. For more details, see the Prometheus ++ docs (https://prometheus.io/docs/guides/query-log/) + type: string + remoteRead: +- description: If specified, the remote_read spec. This is an experimental feature, it may change in any upcoming release in a breaking way. ++ description: If specified, the remote_read spec. This is an experimental ++ feature, it may change in any upcoming release in a breaking way. + items: +- description: RemoteReadSpec defines the remote_read configuration for prometheus. ++ description: RemoteReadSpec defines the remote_read configuration ++ for prometheus. + properties: + basicAuth: + description: BasicAuth for the URL. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor namespace ++ that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor namespace ++ that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -2476,13 +3708,17 @@ + description: File to read bearer token for remote read. + type: string + name: +- description: The name of the remote read queue, must be unique if specified. The name is used in metrics and logging in order to differentiate read configurations. Only valid in Prometheus versions 2.15.0 and newer. ++ description: The name of the remote read queue, must be unique ++ if specified. The name is used in metrics and logging in order ++ to differentiate read configurations. Only valid in Prometheus ++ versions 2.15.0 and newer. + type: string + proxyUrl: + description: Optional ProxyURL + type: string + readRecent: +- description: Whether reads should be made for queries for time ranges that the local storage should have complete data for. ++ description: Whether reads should be made for queries for time ++ ranges that the local storage should have complete data for. + type: boolean + remoteTimeout: + description: Timeout for requests to the remote read endpoint. +@@ -2490,25 +3726,31 @@ + requiredMatchers: + additionalProperties: + type: string +- description: An optional list of equality matchers which have to be present in a selector to query the remote read endpoint. ++ description: An optional list of equality matchers which have ++ to be present in a selector to query the remote read endpoint. + type: object + tlsConfig: + description: TLS Config to use for remote read. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -2517,35 +3759,45 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container ++ to use for the targets. + type: string + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file for ++ the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -2554,38 +3806,48 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus ++ container for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus ++ container for the targets. + type: string + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -2602,39 +3864,49 @@ + type: object + type: array + remoteWrite: +- description: If specified, the remote_write spec. This is an experimental feature, it may change in any upcoming release in a breaking way. ++ description: If specified, the remote_write spec. This is an experimental ++ feature, it may change in any upcoming release in a breaking way. + items: +- description: RemoteWriteSpec defines the remote_write configuration for prometheus. ++ description: RemoteWriteSpec defines the remote_write configuration ++ for prometheus. + properties: + basicAuth: + description: BasicAuth for the URL. + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor namespace ++ that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor namespace ++ that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -2649,50 +3921,67 @@ + headers: + additionalProperties: + type: string +- description: Custom HTTP headers to be sent along with each remote write request. Be aware that headers that are set by Prometheus itself can't be overwritten. Only valid in Prometheus versions 2.25.0 and newer. ++ description: Custom HTTP headers to be sent along with each ++ remote write request. Be aware that headers that are set by ++ Prometheus itself can't be overwritten. Only valid in Prometheus ++ versions 2.25.0 and newer. + type: object + metadataConfig: +- description: MetadataConfig configures the sending of series metadata to remote storage. ++ description: MetadataConfig configures the sending of series ++ metadata to remote storage. + properties: + send: +- description: Whether metric metadata is sent to remote storage or not. ++ description: Whether metric metadata is sent to remote storage ++ or not. + type: boolean + sendInterval: +- description: How frequently metric metadata is sent to remote storage. ++ description: How frequently metric metadata is sent to remote ++ storage. + type: string + type: object + name: +- description: The name of the remote write queue, must be unique if specified. The name is used in metrics and logging in order to differentiate queues. Only valid in Prometheus versions 2.15.0 and newer. ++ description: The name of the remote write queue, must be unique ++ if specified. The name is used in metrics and logging in order ++ to differentiate queues. Only valid in Prometheus versions ++ 2.15.0 and newer. + type: string + proxyUrl: + description: Optional ProxyURL + type: string + queueConfig: +- description: QueueConfig allows tuning of the remote write queue parameters. ++ description: QueueConfig allows tuning of the remote write queue ++ parameters. + properties: + batchSendDeadline: +- description: BatchSendDeadline is the maximum time a sample will wait in buffer. ++ description: BatchSendDeadline is the maximum time a sample ++ will wait in buffer. + type: string + capacity: +- description: Capacity is the number of samples to buffer per shard before we start dropping them. ++ description: Capacity is the number of samples to buffer ++ per shard before we start dropping them. + type: integer + maxBackoff: + description: MaxBackoff is the maximum retry delay. + type: string + maxRetries: +- description: MaxRetries is the maximum number of times to retry a batch on recoverable errors. ++ description: MaxRetries is the maximum number of times to ++ retry a batch on recoverable errors. + type: integer + maxSamplesPerSend: +- description: MaxSamplesPerSend is the maximum number of samples per send. ++ description: MaxSamplesPerSend is the maximum number of ++ samples per send. + type: integer + maxShards: +- description: MaxShards is the maximum number of shards, i.e. amount of concurrency. ++ description: MaxShards is the maximum number of shards, ++ i.e. amount of concurrency. + type: integer + minBackoff: +- description: MinBackoff is the initial retry delay. Gets doubled for every retry. ++ description: MinBackoff is the initial retry delay. Gets ++ doubled for every retry. + type: string + minShards: +- description: MinShards is the minimum number of shards, i.e. amount of concurrency. ++ description: MinShards is the minimum number of shards, ++ i.e. amount of concurrency. + type: integer + type: object + remoteTimeout: +@@ -2702,19 +3991,24 @@ + description: TLS Config to use for remote write. + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -2723,35 +4017,45 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container ++ to use for the targets. + type: string + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file for ++ the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -2760,38 +4064,48 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus ++ container for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus ++ container for the targets. + type: string + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -2806,31 +4120,45 @@ + writeRelabelConfigs: + description: The list of remote write relabel configurations. + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of the ++ label set, being applied to samples before ingestion. It ++ defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex replace ++ is performed if the regular expression matches. Regex ++ capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array +@@ -2839,10 +4167,14 @@ + type: object + type: array + replicaExternalLabelName: +- description: Name of Prometheus external label used to denote replica name. Defaults to the value of `prometheus_replica`. External label will _not_ be added when value is set to empty string (`""`). ++ description: Name of Prometheus external label used to denote replica ++ name. Defaults to the value of `prometheus_replica`. External label ++ will _not_ be added when value is set to empty string (`""`). + type: string + replicas: +- description: Number of replicas of each shard to deploy for a Prometheus deployment. Number of replicas multiplied by shards is the total number of Pods created. ++ description: Number of replicas of each shard to deploy for a Prometheus ++ deployment. Number of replicas multiplied by shards is the total ++ number of Pods created. + format: int32 + type: integer + resources: +@@ -2855,7 +4187,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute resources ++ allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -2864,34 +4197,56 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, otherwise ++ to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + retention: +- description: Time duration Prometheus shall retain data for. Default is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` (milliseconds seconds minutes hours days weeks years). ++ description: Time duration Prometheus shall retain data for. Default ++ is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` ++ (milliseconds seconds minutes hours days weeks years). + type: string + retentionSize: +- description: 'Maximum amount of disk space used by blocks. Supported units: B, KB, MB, GB, TB, PB, EB. Ex: `512MB`.' ++ description: 'Maximum amount of disk space used by blocks. Supported ++ units: B, KB, MB, GB, TB, PB, EB. Ex: `512MB`.' + type: string + routePrefix: +- description: The route prefix Prometheus registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting 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`. ++ description: The route prefix Prometheus registers HTTP handlers for. ++ This is useful, if using ExternalURL and a proxy is rewriting 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 + ruleNamespaceSelector: +- description: Namespaces to be selected for PrometheusRules discovery. If unspecified, only the same namespace as the Prometheus object is in is used. ++ description: Namespaces to be selected for PrometheusRules discovery. ++ If unspecified, only the same namespace as the Prometheus object ++ is in is used. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2903,25 +4258,44 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + ruleSelector: +- description: A selector to select which PrometheusRules to mount for loading alerting/recording rules from. Until (excluding) Prometheus Operator v0.24.0 Prometheus Operator will migrate any legacy rule ConfigMaps to PrometheusRule custom resources selected by RuleSelector. Make sure it does not match any config maps that you do not want to be migrated. ++ description: A selector to select which PrometheusRules to mount for ++ loading alerting/recording rules from. Until (excluding) Prometheus ++ Operator v0.24.0 Prometheus Operator will migrate any legacy rule ++ ConfigMaps to PrometheusRule custom resources selected by RuleSelector. ++ Make sure it does not match any config maps that you do not want ++ to be migrated. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2933,7 +4307,11 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + rules: +@@ -2943,72 +4321,118 @@ + description: /--rules.alert.*/ command-line arguments + properties: + forGracePeriod: +- description: Minimum duration between alert and restored 'for' state. This is maintained only for alerts with configured 'for' time greater than grace period. ++ description: Minimum duration between alert and restored 'for' ++ state. This is maintained only for alerts with configured ++ 'for' time greater than grace period. + type: string + forOutageTolerance: +- description: Max time to tolerate prometheus outage for restoring 'for' state of alert. ++ description: Max time to tolerate prometheus outage for restoring ++ 'for' state of alert. + type: string + resendDelay: +- description: Minimum amount of time to wait before resending an alert to Alertmanager. ++ description: Minimum amount of time to wait before resending ++ an alert to Alertmanager. + type: string + type: object + type: object + scrapeInterval: +- description: Interval between consecutive scrapes. ++ description: 'Interval between consecutive scrapes. Default: `1m`' + type: string + scrapeTimeout: +- description: Number of seconds to wait for target to respond before erroring. ++ description: Number of seconds to wait for target to respond before ++ erroring. + type: string + secrets: +- description: Secrets is a list of Secrets in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods. The Secrets are mounted into /etc/prometheus/secrets/. ++ description: Secrets is a list of Secrets in the same namespace as ++ the Prometheus object, which shall be mounted into the Prometheus ++ Pods. The Secrets are mounted into /etc/prometheus/secrets/. + items: + type: string + type: array + securityContext: +- description: SecurityContext holds pod-level security attributes and common container settings. This defaults to the default PodSecurityContext. ++ description: SecurityContext holds pod-level security attributes and ++ common container settings. This defaults to the default PodSecurityContext. + properties: + fsGroup: +- description: "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: \n 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- \n If unset, the Kubelet will not modify the ownership and permissions of any volume." ++ description: "A special supplemental group that applies to all ++ containers in a pod. Some volume types allow the Kubelet to ++ change the ownership of that volume to be owned by the pod: ++ \n 1. The owning GID will be the FSGroup 2. The setgid bit is ++ set (new files created in the volume will be owned by FSGroup) ++ 3. The permission bits are OR'd with rw-rw---- \n If unset, ++ the Kubelet will not modify the ownership and permissions of ++ any volume." + format: int64 + type: integer + fsGroupChangePolicy: +- description: 'fsGroupChangePolicy defines behavior of changing ownership and permission of the volume before being exposed inside Pod. This field will only apply to volume types which support fsGroup based ownership(and permissions). It will have no effect on ephemeral volume types such as: secret, configmaps and emptydir. Valid values are "OnRootMismatch" and "Always". If not specified defaults to "Always".' ++ description: 'fsGroupChangePolicy defines behavior of changing ++ ownership and permission of the volume before being exposed ++ inside Pod. This field will only apply to volume types which ++ support fsGroup based ownership(and permissions). It will have ++ no effect on ephemeral volume types such as: secret, configmaps ++ and emptydir. Valid values are "OnRootMismatch" and "Always". ++ If not specified defaults to "Always".' + type: string + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The GID to run the entrypoint of the container process. ++ Uses runtime default if unset. May also be set in SecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the value ++ specified in SecurityContext takes precedence for that container. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a non-root ++ user. If true, the Kubelet will validate the image at runtime ++ to ensure that it does not run as UID 0 (root) and fail to start ++ the container if it does. If unset or false, no such validation ++ will be performed. May also be set in SecurityContext. If set ++ in both SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The UID to run the entrypoint of the container process. ++ Defaults to user specified in image metadata if unspecified. ++ May also be set in SecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence for that container. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to all containers. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The SELinux context to be applied to all containers. ++ If unspecified, the container runtime will allocate a random ++ SELinux context for each container. May also be set in SecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the value ++ specified in SecurityContext takes precedence for that container. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies to ++ the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies to ++ the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies to ++ the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies to ++ the container. + type: string + type: object + supplementalGroups: +- description: A list of groups applied to the first process run in each container, in addition to the container's primary GID. If unspecified, no groups will be added to any container. ++ description: A list of groups applied to the first process run ++ in each container, in addition to the container's primary GID. If ++ unspecified, no groups will be added to any container. + items: + format: int64 + type: integer + type: array + sysctls: +- description: Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported sysctls (by the container runtime) might fail to launch. ++ description: Sysctls hold a list of namespaced sysctls used for ++ the pod. Pods with unsupported sysctls (by the container runtime) ++ might fail to launch. + items: + description: Sysctl defines a kernel parameter to be set + properties: +@@ -3024,38 +4448,61 @@ + type: object + type: array + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options within a container's SecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all containers. ++ If unspecified, the options within a container's SecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named by ++ the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the GMSA ++ credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set in PodSecurityContext. ++ If set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + type: string + type: object + type: object + serviceAccountName: +- description: ServiceAccountName is the name of the ServiceAccount to use to run the Prometheus Pods. ++ description: ServiceAccountName is the name of the ServiceAccount ++ to use to run the Prometheus Pods. + type: string + serviceMonitorNamespaceSelector: +- description: Namespace's labels to match for ServiceMonitor discovery. If nil, only check own namespace. ++ description: Namespace's labels to match for ServiceMonitor discovery. ++ If nil, only check own namespace. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -3067,25 +4514,41 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + serviceMonitorSelector: +- description: ServiceMonitors to be selected for target discovery. *Deprecated:* if neither this nor podMonitorSelector are specified, configuration is unmanaged. ++ description: ServiceMonitors to be selected for target discovery. ++ *Deprecated:* if neither this nor podMonitorSelector are specified, ++ configuration is unmanaged. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -3097,33 +4560,61 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + sha: +- description: 'SHA of Prometheus container image to be deployed. Defaults to the value of `version`. Similar to a tag, but the SHA explicitly deploys an immutable container image. Version and Tag are ignored if SHA is set. Deprecated: use ''image'' instead. The image digest can be specified as part of the image URL.' ++ description: 'SHA of Prometheus container image to be deployed. Defaults ++ to the value of `version`. Similar to a tag, but the SHA explicitly ++ deploys an immutable container image. Version and Tag are ignored ++ if SHA is set. Deprecated: use ''image'' instead. The image digest ++ can be specified as part of the image URL.' + type: string + shards: +- description: 'EXPERIMENTAL: Number of shards to distribute targets onto. Number of replicas multiplied by shards is the total number of Pods created. Note that scaling down shards will not reshard data onto 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. Sharding is done on the content of the `__address__` target meta-label.' ++ description: 'EXPERIMENTAL: Number of shards to distribute targets ++ onto. Number of replicas multiplied by shards is the total number ++ of Pods created. Note that scaling down shards will not reshard ++ data onto 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. Sharding ++ is done on the content of the `__address__` target meta-label.' + format: int32 + type: integer + storage: + description: Storage spec to specify how storage shall be used. + properties: + disableMountSubPath: +- description: 'Deprecated: subPath usage will be disabled by default in a future release, this option will become unnecessary. DisableMountSubPath allows to remove any subPath usage in volume mounts.' ++ description: 'Deprecated: subPath usage will be disabled by default ++ in a future release, this option will become unnecessary. DisableMountSubPath ++ allows to remove any subPath usage in volume mounts.' + type: boolean + emptyDir: +- description: 'EmptyDirVolumeSource to be used by the Prometheus StatefulSets. If specified, used in place of any volumeClaimTemplate. More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir' ++ description: 'EmptyDirVolumeSource to be used by the Prometheus ++ StatefulSets. If specified, used in place of any volumeClaimTemplate. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir' + properties: + medium: +- description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'What type of storage medium should back this ++ directory. The default is "" which means to use the node''s ++ default medium. Must be an empty string (default) or Memory. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + type: string + sizeLimit: + anyOf: + - type: integer + - type: string +- description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' ++ description: 'Total amount of local storage required for this ++ EmptyDir volume. The size limit is also applicable for memory ++ medium. The maximum usage on memory medium EmptyDir would ++ be the minimum value between the SizeLimit specified here ++ and the sum of memory limits of all containers in a pod. ++ The default is nil which means that the limit is undefined. ++ More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object +@@ -3131,41 +4622,79 @@ + description: A PVC spec to be used by the Prometheus StatefulSets. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this ++ representation of an object. Servers should convert recognized ++ schemas to the latest internal value, and may reject unrecognized ++ values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST ++ resource this object represents. Servers may infer this ++ from the endpoint the client submits requests to. Cannot ++ be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: +- description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource. ++ description: EmbeddedMetadata contains metadata relevant to ++ an EmbeddedResource. + properties: + annotations: + additionalProperties: + type: string +- description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' ++ description: 'Annotations is an unstructured key value ++ map stored with a resource that may be set by external ++ tools to store and retrieve arbitrary metadata. They ++ are not queryable and should be preserved when modifying ++ objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string +- description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' ++ description: 'Map of string keys and values that can be ++ used to organize and categorize (scope and select) objects. ++ May match selectors of replication controllers and services. ++ More info: http://kubernetes.io/docs/user-guide/labels' + type: object + name: +- description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' ++ description: 'Name must be unique within a namespace. ++ Is required when creating resources, although some resources ++ may allow a client to request the generation of an appropriate ++ name automatically. Name is primarily intended for creation ++ idempotence and configuration definition. Cannot be ++ updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + type: object + spec: +- description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'Spec defines the desired characteristics of ++ a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + accessModes: +- description: 'AccessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' ++ description: 'AccessModes contains the desired access ++ modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' + items: + type: string + type: array + dataSource: +- description: 'This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot - Beta) * An existing PVC (PersistentVolumeClaim) * An existing custom resource/object that implements data population (Alpha) In order to use VolumeSnapshot object types, the appropriate feature gate must be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. If the specified data source is not supported, the volume will not be created and the failure will be reported as an event. In the future, we plan to support more data source types and the behavior of the provisioner may change.' ++ description: 'This field can be used to specify either: ++ * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot ++ - Beta) * An existing PVC (PersistentVolumeClaim) * ++ An existing custom resource/object that implements data ++ population (Alpha) In order to use VolumeSnapshot object ++ types, the appropriate feature gate must be enabled ++ (VolumeSnapshotDataSource or AnyVolumeDataSource) If ++ the provisioner or an external controller can support ++ the specified data source, it will create a new volume ++ based on the contents of the specified data source. ++ If the specified data source is not supported, the volume ++ will not be created and the failure will be reported ++ as an event. In the future, we plan to support more ++ data source types and the behavior of the provisioner ++ may change.' + properties: + apiGroup: +- description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required. ++ description: APIGroup is the group for the resource ++ being referenced. If APIGroup is not specified, ++ the specified Kind must be in the core API group. ++ For any other third-party types, APIGroup is required. + type: string + kind: + description: Kind is the type of resource being referenced +@@ -3178,7 +4707,8 @@ + - name + type: object + resources: +- description: 'Resources represents the minimum resources the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' ++ description: 'Resources represents the minimum resources ++ the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' + properties: + limits: + additionalProperties: +@@ -3187,7 +4717,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount ++ of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -3196,25 +4727,41 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount ++ of compute resources required. If Requests is omitted ++ for a container, it defaults to Limits if that is ++ explicitly specified, otherwise to an implementation-defined ++ value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + selector: +- description: A label query over volumes to consider for binding. ++ description: A label query over volumes to consider for ++ binding. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that ++ relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, ++ NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values ++ array must be non-empty. If the operator is ++ Exists or DoesNotExist, the values array must ++ be empty. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -3226,24 +4773,34 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field ++ is "key", the operator is "In", and the values array ++ contains only "value". The requirements are ANDed. + type: object + type: object + storageClassName: +- description: 'Name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' ++ description: 'Name of the StorageClass required by the ++ claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string + volumeMode: +- description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. ++ description: volumeMode defines what type of volume is ++ required by the claim. Value of Filesystem is implied ++ when not included in claim spec. + type: string + volumeName: +- description: VolumeName is the binding reference to the PersistentVolume backing this claim. ++ description: VolumeName is the binding reference to the ++ PersistentVolume backing this claim. + type: string + type: object + status: +- description: 'Status represents the current information/status of a persistent volume claim. Read-only. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'Status represents the current information/status ++ of a persistent volume claim. Read-only. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + accessModes: +- description: 'AccessModes contains the actual access modes the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' ++ description: 'AccessModes contains the actual access modes ++ the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' + items: + type: string + type: array +@@ -3254,31 +4811,42 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: Represents the actual resources of the underlying volume. ++ description: Represents the actual resources of the underlying ++ volume. + type: object + conditions: +- description: Current Condition of persistent volume claim. If underlying persistent volume is being resized then the Condition will be set to 'ResizeStarted'. ++ description: Current Condition of persistent volume claim. ++ If underlying persistent volume is being resized then ++ the Condition will be set to 'ResizeStarted'. + items: +- description: PersistentVolumeClaimCondition contails details about state of pvc ++ description: PersistentVolumeClaimCondition contails ++ details about state of pvc + properties: + lastProbeTime: + description: Last time we probed the condition. + format: date-time + type: string + lastTransitionTime: +- description: Last time the condition transitioned from one status to another. ++ description: Last time the condition transitioned ++ from one status to another. + format: date-time + type: string + message: +- description: Human-readable message indicating details about last transition. ++ description: Human-readable message indicating details ++ about last transition. + type: string + reason: +- description: Unique, this should be a short, machine understandable string that gives the reason for condition's last transition. If it reports "ResizeStarted" that means the underlying persistent volume is being resized. ++ description: Unique, this should be a short, machine ++ understandable string that gives the reason for ++ condition's last transition. If it reports "ResizeStarted" ++ that means the underlying persistent volume is ++ being resized. + type: string + status: + type: string + type: +- description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type ++ description: PersistentVolumeClaimConditionType ++ is a valid value of PersistentVolumeClaimCondition.Type + type: string + required: + - status +@@ -3292,31 +4860,47 @@ + type: object + type: object + tag: +- description: 'Tag of Prometheus container image to be deployed. Defaults to the value of `version`. Version is ignored if Tag is set. Deprecated: use ''image'' instead. The image tag can be specified as part of the image URL.' ++ description: 'Tag of Prometheus container image to be deployed. Defaults ++ to the value of `version`. Version is ignored if Tag is set. Deprecated: ++ use ''image'' instead. The image tag can be specified as part of ++ the image URL.' + type: string + thanos: +- description: "Thanos configuration allows configuring various aspects of a Prometheus server in a Thanos environment. \n This section is experimental, it may change significantly without deprecation notice in any release. \n This is experimental and may change significantly without backward compatibility in any release." ++ description: "Thanos configuration allows configuring various aspects ++ of a Prometheus server in a Thanos environment. \n This section ++ is experimental, it may change significantly without deprecation ++ notice in any release. \n This is experimental and may change significantly ++ without backward compatibility in any release." + properties: + baseImage: +- description: 'Thanos base image if other than default. Deprecated: use ''image'' instead' ++ description: 'Thanos base image if other than default. Deprecated: ++ use ''image'' instead' + type: string + grpcServerTlsConfig: +- description: 'GRPCServerTLSConfig configures the gRPC server from which Thanos Querier reads recorded rule data. Note: Currently only the CAFile, CertFile, and KeyFile fields are supported. Maps to the ''--grpc-server-tls-*'' CLI args.' ++ description: 'GRPCServerTLSConfig configures the gRPC server from ++ which Thanos Querier reads recorded rule data. Note: Currently ++ only the CAFile, CertFile, and KeyFile fields are supported. ++ Maps to the ''--grpc-server-tls-*'' CLI args.' + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -3325,35 +4909,45 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container ++ to use for the targets. + type: string + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -3362,38 +4956,48 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus ++ container for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus ++ container for the targets. + type: string + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -3403,10 +5007,14 @@ + type: string + type: object + image: +- description: Image if specified has precedence over baseImage, tag and sha combinations. Specifying the version is still necessary to ensure the Prometheus Operator knows what version of Thanos is being configured. ++ description: Image if specified has precedence over baseImage, ++ tag and sha combinations. Specifying the version is still necessary ++ to ensure the Prometheus Operator knows what version of Thanos ++ is being configured. + type: string + listenLocal: +- description: ListenLocal makes the Thanos sidecar listen on loopback, so that it does not bind against the Pod IP. ++ description: ListenLocal makes the Thanos sidecar listen on loopback, ++ so that it does not bind against the Pod IP. + type: boolean + logFormat: + description: LogFormat for Thanos sidecar to be configured with. +@@ -3415,28 +5023,44 @@ + description: LogLevel for Thanos sidecar to be configured with. + type: string + minTime: +- description: MinTime for Thanos sidecar to be configured with. Option can be a constant time in RFC3339 format or time duration relative to current time, such as -1d or 2h45m. Valid duration units are ms, s, m, h, d, w, y. ++ description: MinTime for Thanos sidecar to be configured with. ++ Option can be a constant time in RFC3339 format or time duration ++ relative to current time, such as -1d or 2h45m. Valid duration ++ units are ms, s, m, h, d, w, y. + type: string + objectStorageConfig: +- description: ObjectStorageConfig configures object storage in Thanos. Alternative to ObjectStorageConfigFile, and lower order priority. ++ description: ObjectStorageConfig configures object storage in ++ Thanos. Alternative to ObjectStorageConfigFile, and lower order ++ priority. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be ++ a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must be ++ defined + type: boolean + required: + - key + type: object + objectStorageConfigFile: +- description: ObjectStorageConfigFile specifies the path of the object storage configuration file. When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence. ++ description: ObjectStorageConfigFile specifies the path of the ++ object storage configuration file. When used alongside with ++ ObjectStorageConfig, ObjectStorageConfigFile takes precedence. ++ type: string ++ readyTimeout: ++ description: ReadyTimeout is the maximum time Thanos sidecar will ++ wait for Prometheus to start. Eg 10m + type: string + resources: +- description: Resources defines the resource requirements for the Thanos sidecar. If not provided, no requests/limits will be set ++ description: Resources defines the resource requirements for the ++ Thanos sidecar. If not provided, no requests/limits will be ++ set + properties: + limits: + additionalProperties: +@@ -3445,7 +5069,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -3454,32 +5079,49 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, otherwise ++ to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + sha: +- description: 'SHA of Thanos container image to be deployed. Defaults to the value of `version`. Similar to a tag, but the SHA explicitly deploys an immutable container image. Version and Tag are ignored if SHA is set. Deprecated: use ''image'' instead. The image digest can be specified as part of the image URL.' ++ description: 'SHA of Thanos container image to be deployed. Defaults ++ to the value of `version`. Similar to a tag, but the SHA explicitly ++ deploys an immutable container image. Version and Tag are ignored ++ if SHA is set. Deprecated: use ''image'' instead. The image ++ digest can be specified as part of the image URL.' + type: string + tag: +- description: 'Tag of Thanos sidecar container image to be deployed. Defaults to the value of `version`. Version is ignored if Tag is set. Deprecated: use ''image'' instead. The image tag can be specified as part of the image URL.' ++ description: 'Tag of Thanos sidecar container image to be deployed. ++ Defaults to the value of `version`. Version is ignored if Tag ++ is set. Deprecated: use ''image'' instead. The image tag can ++ be specified as part of the image URL.' + type: string + tracingConfig: +- description: TracingConfig configures tracing in Thanos. This is an experimental feature, it may change in any upcoming release in a breaking way. ++ description: TracingConfig configures tracing in Thanos. This ++ is an experimental feature, it may change in any upcoming release ++ in a breaking way. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be ++ a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must be ++ defined + type: boolean + required: + - key + type: object + tracingConfigFile: +- description: TracingConfig specifies the path of the tracing configuration file. When used alongside with TracingConfig, TracingConfigFile takes precedence. ++ description: TracingConfig specifies the path of the tracing configuration ++ file. When used alongside with TracingConfig, TracingConfigFile ++ takes precedence. + type: string + version: + description: Version describes the version of Thanos to use. +@@ -3488,47 +5130,77 @@ + tolerations: + description: If specified, the pod's tolerations. + items: +- description: The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . ++ description: The pod this Toleration is attached to tolerates any ++ taint that matches the triple using the matching ++ operator . + properties: + effect: +- description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. ++ description: Effect indicates the taint effect to match. Empty ++ means match all taint effects. When specified, allowed values ++ are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: +- description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys. ++ description: Key is the taint key that the toleration applies ++ to. Empty means match all taint keys. If the key is empty, ++ operator must be Exists; this combination means to match all ++ values and all keys. + type: string + operator: +- description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category. ++ description: Operator represents a key's relationship to the ++ value. Valid operators are Exists and Equal. Defaults to Equal. ++ Exists is equivalent to wildcard for value, so that a pod ++ can tolerate all taints of a particular category. + type: string + tolerationSeconds: +- description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system. ++ description: TolerationSeconds represents the period of time ++ the toleration (which must be of effect NoExecute, otherwise ++ this field is ignored) tolerates the taint. By default, it ++ is not set, which means tolerate the taint forever (do not ++ evict). Zero and negative values will be treated as 0 (evict ++ immediately) by the system. + format: int64 + type: integer + value: +- description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string. ++ description: Value is the taint value the toleration matches ++ to. If the operator is Exists, the value should be empty, ++ otherwise just a regular string. + type: string + type: object + type: array + topologySpreadConstraints: + description: If specified, the pod's topology spread constraints. + items: +- description: TopologySpreadConstraint specifies how to spread matching pods among the given topology. ++ description: TopologySpreadConstraint specifies how to spread matching ++ pods among the given topology. + properties: + labelSelector: +- description: LabelSelector is used to find matching pods. Pods that match this label selector are counted to determine the number of pods in their corresponding topology domain. ++ description: LabelSelector is used to find matching pods. Pods ++ that match this label selector are counted to determine the ++ number of pods in their corresponding topology domain. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that relates ++ the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, NotIn, ++ Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values array ++ must be non-empty. If the operator is Exists or ++ DoesNotExist, the values array must be empty. This ++ array is replaced during a strategic merge patch. + items: + type: string + type: array +@@ -3540,18 +5212,48 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field is ++ "key", the operator is "In", and the values array contains ++ only "value". The requirements are ANDed. + type: object + type: object + maxSkew: +- description: 'MaxSkew describes the degree to which pods may be unevenly distributed. It''s the maximum permitted difference between the number of matching pods in any two topology domains of a given topology type. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 1/1/0: | zone1 | zone2 | zone3 | | P | P | | - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 1/1/1; scheduling it onto zone1(zone2) would make the ActualSkew(2-0) on zone1(zone2) violate MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled onto any zone. It''s a required field. Default value is 1 and 0 is not allowed.' ++ description: 'MaxSkew describes the degree to which pods may ++ be unevenly distributed. It''s the maximum permitted difference ++ between the number of matching pods in any two topology domains ++ of a given topology type. For example, in a 3-zone cluster, ++ MaxSkew is set to 1, and pods with the same labelSelector ++ spread as 1/1/0: | zone1 | zone2 | zone3 | | P | P | | ++ - if MaxSkew is 1, incoming pod can only be scheduled to zone3 ++ to become 1/1/1; scheduling it onto zone1(zone2) would make ++ the ActualSkew(2-0) on zone1(zone2) violate MaxSkew(1). - ++ if MaxSkew is 2, incoming pod can be scheduled onto any zone. ++ It''s a required field. Default value is 1 and 0 is not allowed.' + format: int32 + type: integer + topologyKey: +- description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each as a "bucket", and try to put balanced number of pods into each bucket. It's a required field. ++ description: TopologyKey is the key of node labels. Nodes that ++ have a label with this key and identical values are considered ++ to be in the same topology. We consider each ++ as a "bucket", and try to put balanced number of pods into ++ each bucket. It's a required field. + type: string + whenUnsatisfiable: +- description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it - ScheduleAnyway tells the scheduler to still schedule it It''s considered as "Unsatisfiable" if and only if placing incoming pod on any topology violates "MaxSkew". For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.' ++ description: 'WhenUnsatisfiable indicates how to deal with a ++ pod if it doesn''t satisfy the spread constraint. - DoNotSchedule ++ (default) tells the scheduler not to schedule it - ScheduleAnyway ++ tells the scheduler to still schedule it It''s considered ++ as "Unsatisfiable" if and only if placing incoming pod on ++ any topology violates "MaxSkew". For example, in a 3-zone ++ cluster, MaxSkew is set to 1, and pods with the same labelSelector ++ spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | ++ If WhenUnsatisfiable is set to DoNotSchedule, incoming pod ++ can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) ++ as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In ++ other words, the cluster can still be imbalanced, but scheduler ++ won''t make it *more* imbalanced. It''s a required field.' + type: string + required: + - maxSkew +@@ -3563,27 +5265,41 @@ + description: Version of Prometheus to be deployed. + type: string + volumeMounts: +- description: VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the prometheus container, that are generated as a result of StorageSpec objects. ++ description: VolumeMounts allows configuration of additional VolumeMounts ++ on the output StatefulSet definition. VolumeMounts specified will ++ be appended to other VolumeMounts in the prometheus container, that ++ are generated as a result of StorageSpec objects. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume within ++ a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume should ++ be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are propagated ++ from the host to container and the other way around. When ++ not set, MountPropagationNone is used. This field is beta ++ in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which the ++ container's volume should be mounted. Behaves similarly to ++ SubPath but environment variable references $(VAR_NAME) are ++ expanded using the container's environment. Defaults to "" ++ (volume's root). SubPathExpr and SubPath are mutually exclusive. + type: string + required: + - mountPath +@@ -3591,31 +5307,50 @@ + type: object + type: array + volumes: +- description: Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. ++ description: Volumes allows configuration of additional volumes on ++ the output StatefulSet definition. Volumes specified will be appended ++ to other volumes that are generated as a result of StorageSpec objects. + items: +- description: Volume represents a named volume in a pod that may be accessed by any container in the pod. ++ description: Volume represents a named volume in a pod that may ++ be accessed by any container in the pod. + properties: + awsElasticBlockStore: +- description: 'AWSElasticBlockStore represents an AWS Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'AWSElasticBlockStore represents an AWS Disk resource ++ that is attached to a kubelet''s host machine and then exposed ++ to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + partition: +- description: 'The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).' ++ description: 'The partition in the volume that you want ++ to mount. If omitted, the default is to mount by volume ++ name. Examples: For volume /dev/sda1, you specify the ++ partition as "1". Similarly, the volume partition for ++ /dev/sda is "0" (or you can leave the property empty).' + format: int32 + type: integer + readOnly: +- description: 'Specify "true" to force and set the ReadOnly property in VolumeMounts to "true". If omitted, the default is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'Specify "true" to force and set the ReadOnly ++ property in VolumeMounts to "true". If omitted, the default ++ is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + type: boolean + volumeID: +- description: 'Unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'Unique ID of the persistent disk resource ++ in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + type: string + 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. + properties: + cachingMode: + description: 'Host Caching mode: None, Read Only, Read Write.' +@@ -3627,26 +5362,35 @@ + description: The URI the data disk in the blob storage + type: string + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + kind: +- description: 'Expected values Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared' ++ description: 'Expected values Shared: multiple blob disks ++ per storage account Dedicated: single blob disk per storage ++ account Managed: azure managed data disk (only in managed ++ availability set). defaults to shared' + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + required: + - 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. + properties: + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretName: +- description: the name of secret that contains Azure Storage Account Name and Key ++ description: the name of secret that contains Azure Storage ++ Account Name and Key + type: string + shareName: + description: Share Name +@@ -3656,66 +5400,99 @@ + - 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 + properties: + monitors: +- description: 'Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Required: Monitors is a collection of Ceph ++ monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + items: + type: string + type: array + path: +- description: 'Optional: Used as the mounted root, rather than the full Ceph tree, default is /' ++ description: 'Optional: Used as the mounted root, rather ++ than the full Ceph tree, default is /' + type: string + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: boolean + secretFile: +- description: 'Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: SecretFile is the path to key ring ++ for User, default is /etc/ceph/user.secret More info: ++ https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: string + secretRef: +- description: 'Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: SecretRef is reference to the authentication ++ secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + user: +- description: 'Optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: User is the rados user name, default ++ is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: string + required: + - monitors + type: object + cinder: +- description: 'Cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Cinder represents a cinder volume attached and ++ mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + properties: + fsType: +- description: 'Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Examples: ++ "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" ++ if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: string + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: boolean + secretRef: +- description: 'Optional: points to a secret object containing parameters used to connect to OpenStack.' ++ description: 'Optional: points to a secret object containing ++ parameters used to connect to OpenStack.' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + volumeID: +- description: 'volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'volume id used to identify the volume in cinder. ++ More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: string + required: + - volumeID + type: object + configMap: +- description: ConfigMap represents a configMap that should populate this volume ++ description: ConfigMap represents a configMap that should populate ++ this volume + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: +- description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair in the ++ Data field of the referenced ConfigMap will be projected ++ into the volume as a file whose name is the key and content ++ is the value. If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys will not be ++ present. If a key is specified which is not present in ++ the ConfigMap, the volume setup will error unless it is ++ marked optional. Paths must be relative and may not contain ++ the '..' path or start with '..'. + items: + description: Maps a string key to a path within a volume. + properties: +@@ -3723,11 +5500,19 @@ + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file to map ++ the key to. May not be an absolute path. May not ++ contain the path element '..'. May not start with ++ the string '..'. + type: string + required: + - key +@@ -3735,81 +5520,124 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its keys must be defined ++ description: Specify whether the ConfigMap or its keys must ++ be defined + type: boolean + type: object + csi: +- description: CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature). ++ description: CSI (Container Storage Interface) represents storage ++ that is handled by an external CSI driver (Alpha feature). + properties: + driver: +- description: Driver is the name of the CSI driver that handles this volume. Consult with your admin for the correct name as registered in the cluster. ++ description: Driver is the name of the CSI driver that handles ++ this volume. Consult with your admin for the correct name ++ as registered in the cluster. + type: string + fsType: +- description: Filesystem type to mount. Ex. "ext4", "xfs", "ntfs". If not provided, the empty value is passed to the associated CSI driver which will determine the default filesystem to apply. ++ description: Filesystem type to mount. Ex. "ext4", "xfs", ++ "ntfs". If not provided, the empty value is passed to ++ the associated CSI driver which will determine the default ++ filesystem to apply. + type: string + nodePublishSecretRef: +- description: NodePublishSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, and may be empty if no secret is required. If the secret object contains more than one secret, all secret references are passed. ++ description: NodePublishSecretRef is a reference to the ++ secret object containing sensitive information to pass ++ to the CSI driver to complete the CSI NodePublishVolume ++ and NodeUnpublishVolume calls. This field is optional, ++ and may be empty if no secret is required. If the secret ++ object contains more than one secret, all secret references ++ are passed. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + readOnly: +- description: Specifies a read-only configuration for the volume. Defaults to false (read/write). ++ description: Specifies a read-only configuration for the ++ volume. Defaults to false (read/write). + type: boolean + volumeAttributes: + additionalProperties: + type: string +- description: VolumeAttributes stores driver-specific properties that are passed to the CSI driver. Consult your driver's documentation for supported values. ++ description: VolumeAttributes stores driver-specific properties ++ that are passed to the CSI driver. Consult your driver's ++ documentation for supported values. + type: object + required: + - driver + type: object + downwardAPI: +- description: DownwardAPI represents downward API about the pod that should populate this volume ++ description: DownwardAPI represents downward API about the pod ++ that should populate this volume + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: + description: Items is a list of downward API volume file + items: +- description: DownwardAPIVolumeFile represents information to create the file containing the pod field ++ description: DownwardAPIVolumeFile represents information ++ to create the file containing the pod field + properties: + fieldRef: +- description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' ++ description: 'Required: Selects a field of the pod: ++ only annotations, labels, name and namespace are ++ supported.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: 'Required: Path is the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..''' ++ description: 'Required: Path is the relative path ++ name of the file to be created. Must not be absolute ++ or contain the ''..'' path. Must be utf-8 encoded. ++ The first item of the relative path must not start ++ with ''..''' + type: string + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, requests.cpu and requests.memory) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -3824,31 +5652,48 @@ + type: array + type: object + emptyDir: +- description: 'EmptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'EmptyDir represents a temporary directory that ++ shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + properties: + medium: +- description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'What type of storage medium should back this ++ directory. The default is "" which means to use the node''s ++ default medium. Must be an empty string (default) or Memory. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + type: string + sizeLimit: + anyOf: + - type: integer + - type: string +- description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' ++ description: 'Total amount of local storage required for ++ this EmptyDir volume. The size limit is also applicable ++ for memory medium. The maximum usage on memory medium ++ EmptyDir would be the minimum value between the SizeLimit ++ specified here and the sum of memory limits of all containers ++ in a pod. The default is nil which means that the limit ++ is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + fc: +- description: FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. ++ description: FC represents a Fibre Channel resource that is ++ attached to a kubelet's host machine and then exposed to the ++ pod. + properties: + fsType: +- description: 'Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + lun: + description: 'Optional: FC target lun number' + format: int32 + type: integer + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts.' + type: boolean + targetWWNs: + description: 'Optional: FC target worldwide names (WWNs)' +@@ -3856,19 +5701,26 @@ + type: string + type: array + wwids: +- description: 'Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.' ++ description: 'Optional: FC volume world wide identifiers ++ (wwids) Either wwids or combination of targetWWNs and ++ lun must be set, but not both simultaneously.' + items: + type: string + type: array + type: object + flexVolume: +- description: FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. ++ description: FlexVolume represents a generic volume resource ++ that is provisioned/attached using an exec based plugin. + properties: + driver: +- description: Driver is the name of the driver to use for this volume. ++ description: Driver is the name of the driver to use for ++ this volume. + type: string + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". The default filesystem depends on FlexVolume ++ script. + type: string + options: + additionalProperties: +@@ -3876,52 +5728,85 @@ + description: 'Optional: Extra command options if any.' + type: object + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts.' + type: boolean + secretRef: +- description: 'Optional: SecretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.' ++ description: 'Optional: SecretRef is reference to the secret ++ object containing sensitive information to pass to the ++ plugin scripts. This may be empty if no secret object ++ is specified. If the secret object contains more than ++ one secret, all secrets are passed to the plugin scripts.' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + 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 + properties: + datasetName: +- description: Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated ++ description: Name of the dataset stored as metadata -> name ++ on the dataset for Flocker should be considered as deprecated + type: string + datasetUUID: +- description: UUID of the dataset. This is unique identifier of a Flocker dataset ++ description: UUID of the dataset. This is unique identifier ++ of a Flocker dataset + type: string + type: object + gcePersistentDisk: +- description: 'GCEPersistentDisk represents a GCE Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'GCEPersistentDisk represents a GCE Disk resource ++ that is attached to a kubelet''s host machine and then exposed ++ to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + partition: +- description: 'The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'The partition in the volume that you want ++ to mount. If omitted, the default is to mount by volume ++ name. Examples: For volume /dev/sda1, you specify the ++ partition as "1". Similarly, the volume partition for ++ /dev/sda is "0" (or you can leave the property empty). ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + format: int32 + type: integer + pdName: +- description: 'Unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'Unique name of the PD resource in GCE. Used ++ to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + type: string + readOnly: +- description: 'ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + type: boolean + required: + - pdName + 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 EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod''s container.' ++ description: 'GitRepo represents a git repository at a particular ++ revision. 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: +- description: Target directory name. Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name. ++ description: Target directory name. Must not contain or ++ start with '..'. If '.' is supplied, the volume directory ++ will be the git repository. Otherwise, if specified, ++ the volume will contain the git repository in the subdirectory ++ with the given name. + type: string + repository: + description: Repository URL +@@ -3933,35 +5818,51 @@ + - repository + type: object + glusterfs: +- description: 'Glusterfs represents a Glusterfs mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' ++ description: 'Glusterfs represents a Glusterfs mount on the ++ host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' + properties: + endpoints: +- description: 'EndpointsName is the endpoint name that details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'EndpointsName is the endpoint name that details ++ Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: string + path: +- description: 'Path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'Path is the Glusterfs volume path. More info: ++ https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: string + readOnly: +- description: 'ReadOnly here will force the Glusterfs volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'ReadOnly here will force the Glusterfs volume ++ to be mounted with read-only permissions. Defaults to ++ false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: boolean + required: + - endpoints + - path + type: object + hostPath: +- description: 'HostPath represents a pre-existing file or directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the host machine. Most containers will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath --- TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not mount host directories as read/write.' ++ description: 'HostPath represents a pre-existing file or directory ++ on the host machine that is directly exposed to the container. ++ This is generally used for system agents or other privileged ++ things that are allowed to see the host machine. Most containers ++ will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath ++ --- TODO(jonesdl) We need to restrict who can use host directory ++ mounts and who can/can not mount host directories as read/write.' + properties: + path: +- description: 'Path of the directory on the host. If the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' ++ description: 'Path of the directory on the host. If the ++ path is a symlink, it will follow the link to the real ++ path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + type: +- description: 'Type for HostPath Volume Defaults to "" More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' ++ description: 'Type for HostPath Volume Defaults to "" More ++ info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + required: + - path + type: object + iscsi: +- description: 'ISCSI represents an ISCSI Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' ++ description: 'ISCSI represents an ISCSI Disk resource that is ++ attached to a kubelet''s host machine and then exposed to ++ the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' + properties: + chapAuthDiscovery: + description: whether support iSCSI Discovery CHAP authentication +@@ -3970,38 +5871,55 @@ + description: whether support iSCSI Session CHAP authentication + type: boolean + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + initiatorName: +- description: Custom iSCSI Initiator Name. If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface : will be created for the connection. ++ description: Custom iSCSI Initiator Name. If initiatorName ++ is specified with iscsiInterface simultaneously, new iSCSI ++ interface : will be created ++ for the connection. + type: string + iqn: + description: Target iSCSI Qualified Name. + type: string + iscsiInterface: +- description: iSCSI Interface Name that uses an iSCSI transport. Defaults to 'default' (tcp). ++ description: iSCSI Interface Name that uses an iSCSI transport. ++ Defaults to 'default' (tcp). + type: string + lun: + description: iSCSI Target Lun number. + format: int32 + type: integer + portals: +- description: iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260). ++ description: iSCSI Target Portal List. The portal is either ++ an IP or ip_addr:port if the port is other than default ++ (typically TCP ports 860 and 3260). + items: + type: string + type: array + readOnly: +- description: ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. ++ description: ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. + type: boolean + secretRef: +- description: CHAP Secret for iSCSI target and initiator authentication ++ description: CHAP Secret for iSCSI target and initiator ++ authentication + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + targetPortal: +- description: iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260). ++ description: iSCSI Target Portal. The Portal is either an ++ IP or ip_addr:port if the port is other than default (typically ++ TCP ports 860 and 3260). + type: string + required: + - iqn +@@ -4009,56 +5927,76 @@ + - targetPortal + type: object + name: +- description: 'Volume''s name. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' ++ description: 'Volume''s name. Must be a DNS_LABEL and unique ++ within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + nfs: +- description: 'NFS represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'NFS represents an NFS mount on the host that shares ++ a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + properties: + path: +- description: 'Path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'Path that is exported by the NFS server. More ++ info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: string + readOnly: +- description: 'ReadOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'ReadOnly here will force the NFS export to ++ be mounted with read-only permissions. Defaults to false. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: boolean + server: +- description: 'Server is the hostname or IP address of the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'Server is the hostname or IP address of the ++ NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: string + required: + - path + - server + type: object + persistentVolumeClaim: +- description: 'PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'PersistentVolumeClaimVolumeSource represents a ++ reference to a PersistentVolumeClaim in the same namespace. ++ More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + claimName: +- description: 'ClaimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'ClaimName is the name of a PersistentVolumeClaim ++ in the same namespace as the pod using this volume. More ++ info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + type: string + readOnly: +- description: Will force the ReadOnly setting in VolumeMounts. Default false. ++ description: Will force the ReadOnly setting in VolumeMounts. ++ Default false. + type: boolean + 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 + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + pdID: +- description: ID that identifies Photon Controller persistent disk ++ description: ID that identifies Photon Controller persistent ++ disk + type: string + 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 + properties: + fsType: +- description: FSType represents the filesystem type to mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified. ++ description: FSType represents the filesystem type to mount ++ Must be a filesystem type supported by the host operating ++ system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" ++ if unspecified. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + volumeID: + description: VolumeID uniquely identifies a Portworx volume +@@ -4067,34 +6005,62 @@ + - volumeID + type: object + projected: +- description: Items for all in one resources secrets, configmaps, and downward API ++ description: Items for all in one resources secrets, configmaps, ++ and downward API + properties: + defaultMode: +- description: Mode bits to use on created files by default. Must be a value between 0 and 0777. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set. ++ description: Mode bits to use on created files by default. ++ Must be a value between 0 and 0777. Directories within ++ the path are not affected by this setting. This might ++ be in conflict with other options that affect the file ++ mode, like fsGroup, and the result can be other mode bits ++ set. + format: int32 + type: integer + sources: + description: list of volume projections + items: +- description: Projection that may be projected along with other supported volume types ++ description: Projection that may be projected along with ++ other supported volume types + properties: + configMap: +- description: information about the configMap data to project ++ description: information about the configMap data ++ to project + properties: + items: +- description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair ++ in the Data field of the referenced ConfigMap ++ will be projected into the volume as a file ++ whose name is the key and content is the value. ++ If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys ++ will not be present. If a key is specified which ++ is not present in the ConfigMap, the volume ++ setup will error unless it is marked optional. ++ Paths must be relative and may not contain the ++ '..' path or start with '..'. + items: +- description: Maps a string key to a path within a volume. ++ description: Maps a string key to a path within ++ a volume. + properties: + key: + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file ++ to map the key to. May not be an absolute ++ path. May not contain the path element ++ '..'. May not start with the string '..'. + type: string + required: + - key +@@ -4102,54 +6068,85 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its keys must be defined ++ description: Specify whether the ConfigMap or ++ its keys must be defined + type: boolean + type: object + downwardAPI: +- description: information about the downwardAPI data to project ++ description: information about the downwardAPI data ++ to project + properties: + items: +- description: Items is a list of DownwardAPIVolume file ++ description: Items is a list of DownwardAPIVolume ++ file + items: +- description: DownwardAPIVolumeFile represents information to create the file containing the pod field ++ description: DownwardAPIVolumeFile represents ++ information to create the file containing ++ the pod field + properties: + fieldRef: +- description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' ++ description: 'Required: Selects a field ++ of the pod: only annotations, labels, ++ name and namespace are supported.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the ++ FieldPath is written in terms of, ++ defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select ++ in the specified API version. + type: string + required: + - fieldPath + type: object + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: 'Required: Path is the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..''' ++ description: 'Required: Path is the relative ++ path name of the file to be created. Must ++ not be absolute or contain the ''..'' ++ path. Must be utf-8 encoded. The first ++ item of the relative path must not start ++ with ''..''' + type: string + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.' ++ description: 'Selects a resource of the ++ container: only resources limits and requests ++ (limits.cpu, limits.memory, requests.cpu ++ and requests.memory) are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required ++ for volumes, optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format ++ of the exposed resources, defaults ++ to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +- description: 'Required: resource to select' ++ description: 'Required: resource to ++ select' + type: string + required: + - resource +@@ -4160,22 +6157,43 @@ + type: array + type: object + secret: +- description: information about the secret data to project ++ description: information about the secret data to ++ project + properties: + items: +- description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair ++ in the Data field of the referenced Secret will ++ be projected into the volume as a file whose ++ name is the key and content is the value. If ++ specified, the listed keys will be projected ++ into the specified paths, and unlisted keys ++ will not be present. If a key is specified which ++ is not present in the Secret, the volume setup ++ will error unless it is marked optional. Paths ++ must be relative and may not contain the '..' ++ path or start with '..'. + items: +- description: Maps a string key to a path within a volume. ++ description: Maps a string key to a path within ++ a volume. + properties: + key: + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file ++ to map the key to. May not be an absolute ++ path. May not contain the path element ++ '..'. May not start with the string '..'. + type: string + required: + - key +@@ -4183,24 +6201,44 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + type: object + serviceAccountToken: +- description: information about the serviceAccountToken data to project ++ description: information about the serviceAccountToken ++ data to project + properties: + audience: +- description: Audience is the intended audience of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise should reject the token. The audience defaults to the identifier of the apiserver. ++ description: Audience is the intended audience ++ of the token. A recipient of a token must identify ++ itself with an identifier specified in the audience ++ of the token, and otherwise should reject the ++ token. The audience defaults to the identifier ++ of the apiserver. + type: string + expirationSeconds: +- description: ExpirationSeconds is the requested duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively rotate the service account token. The kubelet will start trying to rotate the token if the token is older than 80 percent of its time to live or if the token is older than 24 hours.Defaults to 1 hour and must be at least 10 minutes. ++ description: ExpirationSeconds is the requested ++ duration of validity of the service account ++ token. As the token approaches expiration, the ++ kubelet volume plugin will proactively rotate ++ the service account token. The kubelet will ++ start trying to rotate the token if the token ++ is older than 80 percent of its time to live ++ or if the token is older than 24 hours.Defaults ++ to 1 hour and must be at least 10 minutes. + format: int64 + type: integer + path: +- description: Path is the path relative to the mount point of the file to project the token into. ++ description: Path is the path relative to the ++ mount point of the file to project the token ++ into. + type: string + required: + - path +@@ -4211,103 +6249,143 @@ + - sources + 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 + properties: + group: +- description: Group to map volume access to Default is no group ++ description: Group to map volume access to Default is no ++ group + type: string + readOnly: +- description: ReadOnly here will force the Quobyte volume to be mounted with read-only permissions. Defaults to false. ++ description: ReadOnly here will force the Quobyte volume ++ to be mounted with read-only permissions. Defaults to ++ false. + type: boolean + registry: +- description: Registry represents a single or multiple Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes ++ description: Registry represents a single or multiple Quobyte ++ Registry services specified as a string as host:port pair ++ (multiple entries are separated with commas) which acts ++ as the central registry for volumes + type: string + tenant: +- description: Tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin ++ description: Tenant owning the given Quobyte volume in the ++ Backend Used with dynamically provisioned Quobyte volumes, ++ value is set by the plugin + type: string + user: +- description: User to map volume access to Defaults to serivceaccount user ++ description: User to map volume access to Defaults to serivceaccount ++ user + type: string + volume: +- description: Volume is a string that references an already created Quobyte volume by name. ++ description: Volume is a string that references an already ++ created Quobyte volume by name. + type: string + required: + - registry + - volume + type: object + rbd: +- description: 'RBD represents a Rados Block Device mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' ++ description: 'RBD represents a Rados Block Device mount on the ++ host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + image: + description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + keyring: +- description: 'Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'Keyring is the path to key ring for RBDUser. ++ Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + monitors: +- description: 'A collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'A collection of Ceph monitors. More info: ++ https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + items: + type: string + type: array + pool: +- description: 'The rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'The rados pool name. Default is rbd. More ++ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + readOnly: +- description: 'ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: boolean + secretRef: +- description: 'SecretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'SecretRef is name of the authentication secret ++ for RBDUser. If provided overrides keyring. Default is ++ nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + user: +- description: 'The rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'The rados user name. Default is admin. More ++ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + required: + - 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. + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Default is "xfs". ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Default is "xfs". + type: string + gateway: + description: The host address of the ScaleIO API Gateway. + type: string + protectionDomain: +- description: The name of the ScaleIO Protection Domain for the configured storage. ++ description: The name of the ScaleIO Protection Domain for ++ the configured storage. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretRef: +- description: SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail. ++ description: SecretRef references to the secret for ScaleIO ++ user and other sensitive information. If this is not provided, ++ Login operation will fail. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + sslEnabled: +- description: Flag to enable/disable SSL communication with Gateway, default false ++ description: Flag to enable/disable SSL communication with ++ Gateway, default false + type: boolean + storageMode: +- description: Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned. ++ description: Indicates whether the storage for a volume ++ should be ThickProvisioned or ThinProvisioned. Default ++ is ThinProvisioned. + type: string + storagePool: +- description: The ScaleIO Storage Pool associated with the protection domain. ++ description: The ScaleIO Storage Pool associated with the ++ protection domain. + type: string + system: +- description: The name of the storage system as configured in ScaleIO. ++ description: The name of the storage system as configured ++ in ScaleIO. + type: string + volumeName: +- description: The name of a volume already created in the ScaleIO system that is associated with this volume source. ++ description: The name of a volume already created in the ++ ScaleIO system that is associated with this volume source. + type: string + required: + - gateway +@@ -4315,14 +6393,28 @@ + - system + type: object + secret: +- description: 'Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' ++ description: 'Secret represents a secret that should populate ++ this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: +- description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair in the ++ Data field of the referenced Secret will be projected ++ into the volume as a file whose name is the key and content ++ is the value. If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys will not be ++ present. If a key is specified which is not present in ++ the Secret, the volume setup will error unless it is marked ++ optional. Paths must be relative and may not contain the ++ '..' path or start with '..'. + items: + description: Maps a string key to a path within a volume. + properties: +@@ -4330,11 +6422,19 @@ + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file to map ++ the key to. May not be an absolute path. May not ++ contain the path element '..'. May not start with ++ the string '..'. + type: string + required: + - key +@@ -4342,46 +6442,69 @@ + type: object + type: array + optional: +- description: Specify whether the Secret or its keys must be defined ++ description: Specify whether the Secret or its keys must ++ be defined + type: boolean + secretName: +- description: 'Name of the secret in the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' ++ description: 'Name of the secret in the pod''s namespace ++ to use. 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. + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretRef: +- description: SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted. ++ description: SecretRef specifies the secret to use for obtaining ++ the StorageOS API credentials. If not specified, default ++ values will be attempted. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + volumeName: +- description: VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace. ++ description: VolumeName is the human-readable name of the ++ StorageOS volume. Volume names are only unique within ++ a namespace. + type: string + volumeNamespace: +- description: VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to "default" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created. ++ description: VolumeNamespace specifies the scope of the ++ volume within StorageOS. If no namespace is specified ++ then the Pod's namespace will be used. This allows the ++ Kubernetes name scoping to be mirrored within StorageOS ++ for tighter integration. Set VolumeName to any name to ++ override the default behaviour. Set to "default" if you ++ are not using namespaces within StorageOS. 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 + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + storagePolicyID: +- description: Storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName. ++ description: Storage Policy Based Management (SPBM) profile ++ ID associated with the StoragePolicyName. + type: string + storagePolicyName: +- description: Storage Policy Based Management (SPBM) profile name. ++ description: Storage Policy Based Management (SPBM) profile ++ name. + type: string + volumePath: + description: Path that identifies vSphere volume vmdk +@@ -4394,36 +6517,189 @@ + type: object + type: array + walCompression: +- description: Enable compression of the write-ahead log using Snappy. This flag is only available in versions of Prometheus >= 2.11.0. ++ description: Enable compression of the write-ahead log using Snappy. ++ This flag is only available in versions of Prometheus >= 2.11.0. + type: boolean + web: +- description: WebSpec defines the web command line flags when starting Prometheus. ++ description: WebSpec defines the web command line flags when starting ++ Prometheus. + properties: + pageTitle: + description: The prometheus web page title + type: string ++ tlsConfig: ++ description: WebTLSConfig defines the TLS parameters for HTTPS. ++ properties: ++ cert: ++ description: Contains the TLS certificate for the server. ++ properties: ++ configMap: ++ description: ConfigMap containing data to use for the ++ targets. ++ properties: ++ key: ++ description: The key to select. ++ type: string ++ name: ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' ++ type: string ++ optional: ++ description: Specify whether the ConfigMap or its ++ key must be defined ++ type: boolean ++ required: ++ - key ++ type: object ++ secret: ++ description: Secret containing data to use for the targets. ++ properties: ++ key: ++ description: The key of the secret to select from. Must ++ be a valid secret key. ++ type: string ++ name: ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' ++ type: string ++ optional: ++ description: Specify whether the Secret or its key ++ must be defined ++ type: boolean ++ required: ++ - key ++ type: object ++ type: object ++ cipherSuites: ++ description: 'List of supported cipher suites for TLS versions ++ up to TLS 1.2. If empty, Go default cipher suites are used. ++ Available cipher suites are documented in the go documentation: ++ https://golang.org/pkg/crypto/tls/#pkg-constants' ++ items: ++ type: string ++ type: array ++ client_ca: ++ description: Contains the CA certificate for client certificate ++ authentication to the server. ++ properties: ++ configMap: ++ description: ConfigMap containing data to use for the ++ targets. ++ properties: ++ key: ++ description: The key to select. ++ type: string ++ name: ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' ++ type: string ++ optional: ++ description: Specify whether the ConfigMap or its ++ key must be defined ++ type: boolean ++ required: ++ - key ++ type: object ++ secret: ++ description: Secret containing data to use for the targets. ++ properties: ++ key: ++ description: The key of the secret to select from. Must ++ be a valid secret key. ++ type: string ++ name: ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' ++ type: string ++ optional: ++ description: Specify whether the Secret or its key ++ must be defined ++ type: boolean ++ required: ++ - key ++ type: object ++ type: object ++ clientAuthType: ++ description: 'Server policy for client authentication. Maps ++ to ClientAuth Policies. For more detail on clientAuth options: ++ https://golang.org/pkg/crypto/tls/#ClientAuthType' ++ type: string ++ curvePreferences: ++ description: 'Elliptic curves that will be used in an ECDHE ++ handshake, in preference order. Available curves are documented ++ in the go documentation: https://golang.org/pkg/crypto/tls/#CurveID' ++ items: ++ type: string ++ type: array ++ keySecret: ++ description: Secret containing the TLS key for the server. ++ properties: ++ key: ++ description: The key of the secret to select from. Must ++ be a valid secret key. ++ type: string ++ name: ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' ++ type: string ++ optional: ++ description: Specify whether the Secret or its key must ++ be defined ++ type: boolean ++ required: ++ - key ++ type: object ++ maxVersion: ++ description: Maximum TLS version that is acceptable. Defaults ++ to TLS13. ++ type: string ++ minVersion: ++ description: Minimum TLS version that is acceptable. Defaults ++ to TLS12. ++ type: string ++ preferServerCipherSuites: ++ description: Controls whether the server selects the client's ++ most preferred cipher suite, or the server's most preferred ++ cipher suite. If true then the server's preference, as expressed ++ in the order of elements in cipherSuites, is used. ++ type: boolean ++ required: ++ - cert ++ - keySecret ++ type: object + type: object + type: object + status: +- description: 'Most recent observed status of the Prometheus cluster. Read-only. Not included when requesting from the apiserver, only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' ++ description: 'Most recent observed status of the Prometheus cluster. Read-only. ++ Not included when requesting from the apiserver, only from the Prometheus ++ Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + properties: + availableReplicas: +- description: Total number of available pods (ready for at least minReadySeconds) targeted by this Prometheus deployment. ++ description: Total number of available pods (ready for at least minReadySeconds) ++ targeted by this Prometheus deployment. + format: int32 + type: integer + paused: +- description: Represents whether any actions on the underlying managed objects are being performed. Only delete actions will be performed. ++ description: Represents whether any actions on the underlying managed ++ objects are being performed. Only delete actions will be performed. + type: boolean + replicas: +- description: Total number of non-terminated pods targeted by this Prometheus deployment (their labels match the selector). ++ description: Total number of non-terminated pods targeted by this ++ Prometheus deployment (their labels match the selector). + format: int32 + type: integer + unavailableReplicas: +- description: Total number of unavailable pods targeted by this Prometheus deployment. ++ description: Total number of unavailable pods targeted by this Prometheus ++ deployment. + format: int32 + type: integer + updatedReplicas: +- description: Total number of non-terminated pods targeted by this Prometheus deployment that have the desired version spec. ++ description: Total number of non-terminated pods targeted by this ++ Prometheus deployment that have the desired version spec. + format: int32 + type: integer + required: diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-prometheusrules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-prometheusrules.yaml.patch new file mode 100644 index 000000000..a11143c11 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-prometheusrules.yaml.patch @@ -0,0 +1,54 @@ +--- charts-original/crds/crd-prometheusrules.yaml ++++ charts/crds/crd-prometheusrules.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -20,13 +20,18 @@ + - name: v1 + schema: + openAPIV3Schema: +- description: PrometheusRule defines recording and alerting rules for a Prometheus instance ++ description: PrometheusRule defines recording and alerting rules for a Prometheus ++ instance + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object +@@ -36,7 +41,10 @@ + groups: + description: Content of Prometheus rule file + items: +- description: 'RuleGroup is a list of sequentially evaluated recording and alerting rules. Note: PartialResponseStrategy is only used by ThanosRuler and will be ignored by Prometheus instances. Valid values for this field are ''warn'' or ''abort''. More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response' ++ description: 'RuleGroup is a list of sequentially evaluated recording ++ and alerting rules. Note: PartialResponseStrategy is only used ++ by ThanosRuler and will be ignored by Prometheus instances. Valid ++ values for this field are ''warn'' or ''abort''. More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response' + properties: + interval: + type: string +@@ -46,7 +54,10 @@ + type: string + rules: + items: +- description: Rule describes an alerting or recording rule. ++ description: 'Rule describes an alerting or recording rule ++ See Prometheus documentation: [alerting](https://www.prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) ++ or [recording](https://www.prometheus.io/docs/prometheus/latest/configuration/recording_rules/#recording-rules) ++ rule' + properties: + alert: + type: string diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-servicemonitors.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-servicemonitors.yaml.patch new file mode 100644 index 000000000..be86cdc0f --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-servicemonitors.yaml.patch @@ -0,0 +1,501 @@ +--- charts-original/crds/crd-servicemonitors.yaml ++++ charts/crds/crd-servicemonitors.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -25,50 +25,65 @@ + description: ServiceMonitor defines monitoring for a set of services. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: Specification of desired Service selection for target discovery by Prometheus. ++ description: Specification of desired Service selection for target discovery ++ by Prometheus. + properties: + endpoints: + description: A list of endpoints allowed as part of this ServiceMonitor. + items: +- description: Endpoint defines a scrapeable endpoint serving Prometheus metrics. ++ description: Endpoint defines a scrapeable endpoint serving Prometheus ++ metrics. + properties: + basicAuth: +- description: 'BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints' ++ description: 'BasicAuth allow an endpoint to authenticate over ++ basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints' + properties: + password: +- description: The secret in the service monitor namespace that contains the password for authentication. ++ description: The secret in the service monitor namespace ++ that contains the password for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + username: +- description: The secret in the service monitor namespace that contains the username for authentication. ++ description: The secret in the service monitor namespace ++ that contains the username for authentication. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -78,57 +93,79 @@ + description: File to read bearer token for scraping targets. + type: string + bearerTokenSecret: +- description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the service monitor and accessible by the Prometheus Operator. ++ description: Secret to mount to read bearer token for scraping ++ targets. The secret needs to be in the same namespace as the ++ service monitor and accessible by the Prometheus Operator. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + honorLabels: +- description: HonorLabels chooses the metric's labels on collisions with target labels. ++ description: HonorLabels chooses the metric's labels on collisions ++ with target labels. + type: boolean + honorTimestamps: +- description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. ++ description: HonorTimestamps controls whether Prometheus respects ++ the timestamps present in scraped data. + type: boolean + interval: + description: Interval at which metrics should be scraped + type: string + metricRelabelings: +- description: MetricRelabelConfigs to apply to samples before ingestion. ++ description: MetricRelabelConfigs to apply to samples before ++ ingestion. + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of the ++ label set, being applied to samples before ingestion. It ++ defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex replace ++ is performed if the regular expression matches. Regex ++ capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array +@@ -143,39 +180,58 @@ + description: HTTP path to scrape for metrics. + type: string + port: +- description: Name of the service port this endpoint refers to. Mutually exclusive with targetPort. ++ description: Name of the service port this endpoint refers to. ++ Mutually exclusive with targetPort. + type: string + proxyUrl: +- description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint. ++ description: ProxyURL eg http://proxyserver:2195 Directs scrapes ++ to proxy through this endpoint. + type: string + relabelings: +- description: 'RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields and replaces original scrape job name with __tmp_prometheus_job_name. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' ++ description: 'RelabelConfigs to apply to samples before scraping. ++ Prometheus Operator automatically adds relabelings for a few ++ standard Kubernetes fields and replaces original scrape job ++ name with __tmp_prometheus_job_name. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + items: +- description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' ++ description: 'RelabelConfig allows dynamic rewriting of the ++ label set, being applied to samples before ingestion. It ++ defines ``-section of Prometheus ++ configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: +- description: Action to perform based on regex matching. Default is 'replace' ++ description: Action to perform based on regex matching. ++ Default is 'replace' + type: string + modulus: +- description: Modulus to take of the hash of the source label values. ++ description: Modulus to take of the hash of the source ++ label values. + format: int64 + type: integer + regex: +- description: Regular expression against which the extracted value is matched. Default is '(.*)' ++ description: Regular expression against which the extracted ++ value is matched. Default is '(.*)' + type: string + replacement: +- description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' ++ description: Replacement value against which a regex replace ++ is performed if the regular expression matches. Regex ++ capture groups are available. Default is '$1' + type: string + separator: +- description: Separator placed between concatenated source label values. default is ';'. ++ description: Separator placed between concatenated source ++ label values. default is ';'. + type: string + sourceLabels: +- description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. ++ description: The source labels select values from existing ++ labels. Their content is concatenated using the configured ++ separator and matched against the configured regular ++ expression for the replace, keep, and drop actions. + items: + type: string + type: array + targetLabel: +- description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. ++ description: Label to which the resulting value is written ++ in a replace action. It is mandatory for replace actions. ++ Regex capture groups are available. + type: string + type: object + type: array +@@ -189,25 +245,32 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port. ++ description: Name or number of the target port of the Pod behind ++ the Service, the port must be specified with container port ++ property. Mutually exclusive with port. + x-kubernetes-int-or-string: true + tlsConfig: + description: TLS configuration to use when scraping the endpoint + properties: + ca: +- description: Struct containing the CA cert to use for the targets. ++ description: Struct containing the CA cert to use for the ++ targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -216,35 +279,45 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container ++ to use for the targets. + type: string + cert: +- description: Struct containing the client cert file for the targets. ++ description: Struct containing the client cert file for ++ the targets. + properties: + configMap: +- description: ConfigMap containing data to use for the targets. ++ description: ConfigMap containing data to use for the ++ targets. + properties: + key: + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its ++ key must be defined + type: boolean + required: + - key +@@ -253,38 +326,48 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key ++ must be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus ++ container for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus ++ container for the targets. + type: string + keySecret: +- description: Secret containing the client key file for the targets. ++ description: Secret containing the client key file for the ++ targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key +@@ -296,13 +379,18 @@ + type: object + type: array + jobLabel: +- description: The label to use to retrieve the job name from. ++ description: "Chooses the label of the Kubernetes `Endpoints`. Its ++ value will be used for the `job`-label's value of the created metrics. ++ \n Default & fallback value: the name of the respective Kubernetes ++ `Endpoint`." + type: string + namespaceSelector: +- description: Selector to select which namespaces the Endpoints objects are discovered from. ++ description: Selector to select which namespaces the Kubernetes Endpoints ++ objects are discovered from. + properties: + any: +- description: Boolean describing whether all namespaces are selected in contrast to a list restricting them. ++ description: Boolean describing whether all namespaces are selected ++ in contrast to a list restricting them. + type: boolean + matchNames: + description: List of namespace names. +@@ -311,30 +399,42 @@ + type: array + type: object + podTargetLabels: +- description: PodTargetLabels transfers labels on the Kubernetes Pod onto the target. ++ description: PodTargetLabels transfers labels on the Kubernetes `Pod` ++ onto the created metrics. + items: + type: string + type: array + sampleLimit: +- description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. ++ description: SampleLimit defines per-scrape limit on number of scraped ++ samples that will be accepted. + format: int64 + type: integer + selector: + description: Selector to select Endpoints objects. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -346,16 +446,23 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + targetLabels: +- description: TargetLabels transfers labels on the Kubernetes Service onto the target. ++ description: TargetLabels transfers labels from the Kubernetes `Service` ++ onto the created metrics. All labels set in `selector.matchLabels` ++ are automatically transferred. + items: + type: string + type: array + targetLimit: +- description: TargetLimit defines a limit on the number of scraped targets that will be accepted. ++ description: TargetLimit defines a limit on the number of scraped ++ targets that will be accepted. + format: int64 + type: integer + required: diff --git a/packages/rancher-monitoring/generated-changes/patch/crds/crd-thanosrulers.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/crds/crd-thanosrulers.yaml.patch new file mode 100644 index 000000000..2b5192381 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/crds/crd-thanosrulers.yaml.patch @@ -0,0 +1,5414 @@ +--- charts-original/crds/crd-thanosrulers.yaml ++++ charts/crds/crd-thanosrulers.yaml +@@ -1,4 +1,4 @@ +-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.48.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml ++# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml + + --- + apiVersion: apiextensions.k8s.io/v1 +@@ -25,43 +25,78 @@ + description: ThanosRuler defines a ThanosRuler deployment. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this representation ++ of an object. Servers should convert recognized schemas to the latest ++ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST resource this ++ object represents. Servers may infer this from the endpoint the client ++ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: +- description: 'Specification of the desired behavior of the ThanosRuler cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' ++ description: 'Specification of the desired behavior of the ThanosRuler ++ cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + properties: + affinity: + description: If specified, the pod's scheduling constraints. + properties: + nodeAffinity: +- description: Describes node affinity scheduling rules for the pod. ++ description: Describes node affinity scheduling rules for the ++ pod. + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the affinity expressions specified by ++ this field, but it may choose a node that violates one or ++ more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node matches ++ the corresponding matchExpressions; the node(s) with the ++ highest sum are the most preferred. + items: +- description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op). ++ description: An empty preferred scheduling term matches ++ all objects with implicit weight 0 (i.e. it's a no-op). ++ A null preferred scheduling term matches no objects (i.e. ++ is also a no-op). + properties: + preference: +- description: A node selector term, associated with the corresponding weight. ++ description: A node selector term, associated with the ++ corresponding weight. + properties: + matchExpressions: +- description: A list of node selector requirements by node's labels. ++ description: A list of node selector requirements ++ by node's labels. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -71,18 +106,33 @@ + type: object + type: array + matchFields: +- description: A list of node selector requirements by node's fields. ++ description: A list of node selector requirements ++ by node's fields. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -93,7 +143,8 @@ + type: array + type: object + weight: +- description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. ++ description: Weight associated with matching the corresponding ++ nodeSelectorTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -102,26 +153,50 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node. ++ description: If the affinity requirements specified by this ++ field are not met at scheduling time, the pod will not be ++ scheduled onto the node. If the affinity requirements specified ++ by this field cease to be met at some point during pod execution ++ (e.g. due to an update), the system may or may not try to ++ eventually evict the pod from its node. + properties: + nodeSelectorTerms: +- description: Required. A list of node selector terms. The terms are ORed. ++ description: Required. A list of node selector terms. ++ The terms are ORed. + items: +- description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm. ++ description: A null or empty node selector term matches ++ no objects. The requirements of them are ANDed. The ++ TopologySelectorTerm type implements a subset of the ++ NodeSelectorTerm. + properties: + matchExpressions: +- description: A list of node selector requirements by node's labels. ++ description: A list of node selector requirements ++ by node's labels. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -131,18 +206,33 @@ + type: object + type: array + matchFields: +- description: A list of node selector requirements by node's fields. ++ description: A list of node selector requirements ++ by node's fields. + items: +- description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A node selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: The label key that the selector applies to. ++ description: The label key that the selector ++ applies to. + type: string + operator: +- description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. ++ description: Represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists, DoesNotExist. Gt, and ++ Lt. + type: string + values: +- description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch. ++ description: An array of string values. If ++ the operator is In or NotIn, the values ++ array must be non-empty. If the operator ++ is Exists or DoesNotExist, the values array ++ must be empty. If the operator is Gt or ++ Lt, the values array must have a single ++ element, which will be interpreted as an ++ integer. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -158,32 +248,61 @@ + type: object + type: object + podAffinity: +- description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)). ++ description: Describes pod affinity scheduling rules (e.g. co-locate ++ this pod in the same node, zone, etc. as some other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the affinity expressions specified by ++ this field, but it may choose a node that violates one or ++ more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node has ++ pods which matches the corresponding podAffinityTerm; the ++ node(s) with the highest sum are the most preferred. + items: +- description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s) ++ description: The weights of all of the matched WeightedPodAffinityTerm ++ fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: +- description: Required. A pod affinity term, associated with the corresponding weight. ++ description: Required. A pod affinity term, associated ++ with the corresponding weight. + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ++ ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement ++ is a selector that contains values, a key, ++ and an operator that relates the key and ++ values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that ++ the selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's ++ relationship to a set of values. Valid ++ operators are In, NotIn, Exists and ++ DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, ++ the values array must be empty. This ++ array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -195,22 +314,36 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is ++ "In", and the values array contains only "value". ++ The requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces ++ the labelSelector applies to (matches against); ++ null or empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods ++ matching the labelSelector in the specified namespaces, ++ where co-located is defined as running on a node ++ whose value of the label with key topologyKey ++ matches that of any node on which any of the selected ++ pods is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + weight: +- description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. ++ description: weight associated with matching the corresponding ++ podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -219,26 +352,52 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied. ++ description: If the affinity requirements specified by this ++ field are not met at scheduling time, the pod will not be ++ scheduled onto the node. If the affinity requirements specified ++ by this field cease to be met at some point during pod execution ++ (e.g. due to a pod label update), the system may or may ++ not try to eventually evict the pod from its node. When ++ there are multiple elements, the lists of nodes corresponding ++ to each podAffinityTerm are intersected, i.e. all terms ++ must be satisfied. + items: +- description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running ++ description: Defines a set of pods (namely those matching ++ the labelSelector relative to the given namespace(s)) ++ that this pod should be co-located (affinity) or not co-located ++ (anti-affinity) with, where co-located is defined as running ++ on a node whose value of the label with key ++ matches that of any node on which a pod of the set of ++ pods is running + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the ++ selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. If the ++ operator is Exists or DoesNotExist, the ++ values array must be empty. This array is ++ replaced during a strategic merge patch. + items: + type: string + type: array +@@ -250,16 +409,29 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is "In", ++ and the values array contains only "value". The ++ requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces the ++ labelSelector applies to (matches against); null or ++ empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods matching ++ the labelSelector in the specified namespaces, where ++ co-located is defined as running on a node whose value ++ of the label with key topologyKey matches that of ++ any node on which any of the selected pods is running. ++ Empty topologyKey is not allowed. + type: string + required: + - topologyKey +@@ -267,32 +439,62 @@ + type: array + type: object + podAntiAffinity: +- description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)). ++ description: Describes pod anti-affinity scheduling rules (e.g. ++ avoid putting this pod in the same node, zone, etc. as some ++ other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: +- description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred. ++ description: The scheduler will prefer to schedule pods to ++ nodes that satisfy the anti-affinity expressions specified ++ by this field, but it may choose a node that violates one ++ or more of the expressions. The node that is most preferred ++ is the one with the greatest sum of weights, i.e. for each ++ node that meets all of the scheduling requirements (resource ++ request, requiredDuringScheduling anti-affinity expressions, ++ etc.), compute a sum by iterating through the elements of ++ this field and adding "weight" to the sum if the node has ++ pods which matches the corresponding podAffinityTerm; the ++ node(s) with the highest sum are the most preferred. + items: +- description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s) ++ description: The weights of all of the matched WeightedPodAffinityTerm ++ fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: +- description: Required. A pod affinity term, associated with the corresponding weight. ++ description: Required. A pod affinity term, associated ++ with the corresponding weight. + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ++ ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement ++ is a selector that contains values, a key, ++ and an operator that relates the key and ++ values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that ++ the selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's ++ relationship to a set of values. Valid ++ operators are In, NotIn, Exists and ++ DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, ++ the values array must be empty. This ++ array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -304,22 +506,36 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is ++ "In", and the values array contains only "value". ++ The requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces ++ the labelSelector applies to (matches against); ++ null or empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods ++ matching the labelSelector in the specified namespaces, ++ where co-located is defined as running on a node ++ whose value of the label with key topologyKey ++ matches that of any node on which any of the selected ++ pods is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + weight: +- description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. ++ description: weight associated with matching the corresponding ++ podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: +@@ -328,26 +544,52 @@ + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: +- description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied. ++ description: If the anti-affinity requirements specified by ++ this field are not met at scheduling time, the pod will ++ not be scheduled onto the node. If the anti-affinity requirements ++ specified by this field cease to be met at some point during ++ pod execution (e.g. due to a pod label update), the system ++ may or may not try to eventually evict the pod from its ++ node. When there are multiple elements, the lists of nodes ++ corresponding to each podAffinityTerm are intersected, i.e. ++ all terms must be satisfied. + items: +- description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key matches that of any node on which a pod of the set of pods is running ++ description: Defines a set of pods (namely those matching ++ the labelSelector relative to the given namespace(s)) ++ that this pod should be co-located (affinity) or not co-located ++ (anti-affinity) with, where co-located is defined as running ++ on a node whose value of the label with key ++ matches that of any node on which a pod of the set of ++ pods is running + properties: + labelSelector: +- description: A label query over a set of resources, in this case pods. ++ description: A label query over a set of resources, ++ in this case pods. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label ++ selector requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a ++ selector that contains values, a key, and an ++ operator that relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the ++ selector applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are ++ In, NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string ++ values. If the operator is In or NotIn, ++ the values array must be non-empty. If the ++ operator is Exists or DoesNotExist, the ++ values array must be empty. This array is ++ replaced during a strategic merge patch. + items: + type: string + type: array +@@ -359,16 +601,29 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} ++ pairs. A single {key,value} in the matchLabels ++ map is equivalent to an element of matchExpressions, ++ whose key field is "key", the operator is "In", ++ and the values array contains only "value". The ++ requirements are ANDed. + type: object + type: object + namespaces: +- description: namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod's namespace" ++ description: namespaces specifies which namespaces the ++ labelSelector applies to (matches against); null or ++ empty list means "this pod's namespace" + items: + type: string + type: array + topologyKey: +- description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed. ++ description: This pod should be co-located (affinity) ++ or not co-located (anti-affinity) with the pods matching ++ the labelSelector in the specified namespaces, where ++ co-located is defined as running on a node whose value ++ of the label with key topologyKey matches that of ++ any node on which any of the selected pods is running. ++ Empty topologyKey is not allowed. + type: string + required: + - topologyKey +@@ -377,21 +632,29 @@ + type: object + type: object + alertDropLabels: +- description: AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts. If `labels` field is not provided, `thanos_ruler_replica` will be dropped in alerts by default. ++ description: AlertDropLabels configure the label names which should ++ be dropped in ThanosRuler alerts. If `labels` field is not provided, ++ `thanos_ruler_replica` will be dropped in alerts by default. + items: + type: string + type: array + alertQueryUrl: +- description: The external Query URL the Thanos Ruler will set in the 'Source' field of all alerts. Maps to the '--alert.query-url' CLI arg. ++ description: The external Query URL the Thanos Ruler will set in the ++ 'Source' field of all alerts. Maps to the '--alert.query-url' CLI ++ arg. + type: string + alertmanagersConfig: +- description: Define configuration for connecting to alertmanager. Only available with thanos v0.10.0 and higher. Maps to the `alertmanagers.config` arg. ++ description: Define configuration for connecting to alertmanager. Only ++ available with thanos v0.10.0 and higher. Maps to the `alertmanagers.config` ++ arg. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -400,38 +663,76 @@ + - key + type: object + 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.' ++ 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.' + items: + type: string + type: array + containers: +- description: 'Containers allows injecting additional containers or modifying operator generated containers. This can be used to allow adding an authentication proxy to a ThanosRuler pod or to change the behavior of an operator generated container. Containers described here modify an operator generated container if they share the same name and modifications are done via a strategic merge patch. The current container names are: `thanos-ruler` and `config-reloader`. Overriding containers is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice.' ++ description: 'Containers allows injecting additional containers or ++ modifying operator generated containers. This can be used to allow ++ adding an authentication proxy to a ThanosRuler pod or to change ++ the behavior of an operator generated container. Containers described ++ here modify an operator generated container if they share the same ++ name and modifications are done via a strategic merge patch. The ++ current container names are: `thanos-ruler` and `config-reloader`. ++ Overriding containers is entirely outside the scope of what the ++ maintainers will support and by doing so, you accept that this behaviour ++ may break at any time without notice.' + items: +- description: A single application container that you want to run within a pod. ++ description: A single application container that you want to run ++ within a pod. + properties: + args: +- description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Arguments to the entrypoint. The docker image''s ++ CMD is used if this is not provided. Variable references $(VAR_NAME) ++ are expanded using the container''s environment. If a variable ++ cannot be resolved, the reference in the input string will ++ be unchanged. The $(VAR_NAME) syntax can be escaped with a ++ double $$, ie: $$(VAR_NAME). Escaped references will never ++ be expanded, regardless of whether the variable exists or ++ not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + command: +- description: 'Entrypoint array. Not executed within a shell. The docker image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Entrypoint array. Not executed within a shell. ++ The docker image''s ENTRYPOINT is used if this is not provided. ++ Variable references $(VAR_NAME) are expanded using the container''s ++ environment. If a variable cannot be resolved, the reference ++ in the input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether the ++ variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + env: +- description: List of environment variables to set in the container. Cannot be updated. ++ description: List of environment variables to set in the container. ++ Cannot be updated. + items: +- description: EnvVar represents an environment variable present in a Container. ++ description: EnvVar represents an environment variable present ++ in a Container. + properties: + name: +- description: Name of the environment variable. Must be a C_IDENTIFIER. ++ description: Name of the environment variable. Must be ++ a C_IDENTIFIER. + type: string + value: +- description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' ++ description: 'Variable references $(VAR_NAME) are expanded ++ using the previous defined environment variables in ++ the container and any service environment variables. ++ If a variable cannot be resolved, the reference in the ++ input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether ++ the variable exists or not. Defaults to "".' + type: string + valueFrom: +- description: Source for the environment variable's value. Cannot be used if value is not empty. ++ description: Source for the environment variable's value. ++ Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. +@@ -440,37 +741,52 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + fieldRef: +- description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' ++ description: 'Selects a field of the pod: supports ++ metadata.name, metadata.namespace, metadata.labels, ++ metadata.annotations, spec.nodeName, spec.serviceAccountName, ++ status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, limits.ephemeral-storage, requests.cpu, ++ requests.memory and requests.ephemeral-storage) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -480,16 +796,22 @@ + - resource + type: object + secretKeyRef: +- description: Selects a key of a secret in the pod's namespace ++ description: Selects a key of a secret in the pod's ++ namespace + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -500,28 +822,41 @@ + type: object + type: array + envFrom: +- description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated. ++ description: List of sources to populate environment variables ++ in the container. The keys defined within a source must be ++ a C_IDENTIFIER. All invalid keys will be reported as an event ++ when the container is starting. When a key exists in multiple ++ sources, the value associated with the last source will take ++ precedence. Values defined by an Env with a duplicate key ++ will take precedence. Cannot be updated. + items: +- description: EnvFromSource represents the source of a set of ConfigMaps ++ description: EnvFromSource represents the source of a set ++ of ConfigMaps + properties: + configMapRef: + description: The ConfigMap to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap must be defined ++ description: Specify whether the ConfigMap must be ++ defined + type: boolean + type: object + prefix: +- description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. ++ description: An optional identifier to prepend to each ++ key in the ConfigMap. Must be a C_IDENTIFIER. + type: string + secretRef: + description: The Secret to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: + description: Specify whether the Secret must be defined +@@ -530,22 +865,41 @@ + type: object + type: array + image: +- description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' ++ description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images ++ This field is optional to allow higher level config management ++ to default or override container images in workload controllers ++ like Deployments and StatefulSets.' + type: string + imagePullPolicy: +- description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' ++ description: 'Image pull policy. One of Always, Never, IfNotPresent. ++ Defaults to Always if :latest tag is specified, or IfNotPresent ++ otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' + type: string + lifecycle: +- description: Actions that the management system should take in response to container lifecycle events. Cannot be updated. ++ description: Actions that the management system should take ++ in response to container lifecycle events. Cannot be updated. + properties: + postStart: +- description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PostStart is called immediately after a container ++ is created. If the handler fails, the container is terminated ++ and restarted according to its restart policy. 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: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -554,12 +908,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -579,38 +937,66 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + type: object + preStop: +- description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The reason for termination is passed to the handler. The Pod''s termination grace period countdown begins before the PreStop hooked is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period. Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PreStop is called immediately before a container ++ is terminated due to an API request or management event ++ such as liveness/startup probe failure, preemption, resource ++ contention, etc. The handler is not called if the container ++ crashes or exits. The reason for termination is passed ++ to the handler. The Pod''s termination grace period countdown ++ begins before the PreStop hooked is executed. Regardless ++ of the outcome of the handler, the container will eventually ++ terminate within the Pod''s termination grace period. ++ Other management of the container blocks until the hook ++ completes or until the termination grace period is reached. ++ More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -619,12 +1005,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -644,25 +1034,33 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port +@@ -670,31 +1068,47 @@ + type: object + type: object + livenessProbe: +- description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container liveness. Container ++ will be restarted if the probe fails. Cannot be updated. More ++ info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -714,71 +1128,104 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + name: +- description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated. ++ description: Name of the container specified as a DNS_LABEL. ++ Each container in a pod must have a unique name (DNS_LABEL). ++ Cannot be updated. + type: string + ports: +- description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. ++ description: List of ports to expose from the container. Exposing ++ a port here gives the system additional information about ++ the network connections a container uses, but is primarily ++ informational. Not specifying a port here DOES NOT prevent ++ that port from being exposed. Any port which is listening ++ on the default "0.0.0.0" address inside a container will be ++ accessible from the network. Cannot be updated. + items: +- description: ContainerPort represents a network port in a single container. ++ description: ContainerPort represents a network port in a ++ single container. + properties: + containerPort: +- description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536. ++ description: Number of port to expose on the pod's IP ++ address. This must be a valid port number, 0 < x < 65536. + format: int32 + type: integer + hostIP: + description: What host IP to bind the external port to. + type: string + hostPort: +- description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. ++ description: Number of port to expose on the host. If ++ specified, this must be a valid port number, 0 < x < ++ 65536. If HostNetwork is specified, this must match ++ ContainerPort. Most containers do not need this. + format: int32 + type: integer + name: +- description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. ++ description: If specified, this must be an IANA_SVC_NAME ++ and unique within the pod. Each named port in a pod ++ must have a unique name. Name for the port that can ++ be referred to by services. + type: string + protocol: + default: TCP +- description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP". ++ description: Protocol for port. Must be UDP, TCP, or SCTP. ++ Defaults to "TCP". + type: string + required: + - containerPort +@@ -789,31 +1236,47 @@ + - protocol + x-kubernetes-list-type: map + readinessProbe: +- description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container service readiness. ++ Container will be removed from service endpoints if the probe ++ fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -833,48 +1296,65 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + resources: +- description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Compute Resources required by this container. ++ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + properties: + limits: + additionalProperties: +@@ -883,7 +1363,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -892,107 +1373,187 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, ++ otherwise to an implementation-defined value. More info: ++ https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + securityContext: +- description: 'Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' ++ description: 'Security options the pod should run with. More ++ info: https://kubernetes.io/docs/concepts/policy/security-context/ ++ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' + properties: + allowPrivilegeEscalation: +- description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN' ++ description: 'AllowPrivilegeEscalation controls whether ++ a process can gain more privileges than its parent process. ++ This bool directly controls if the no_new_privs flag will ++ be set on the container process. AllowPrivilegeEscalation ++ is true always when the container is: 1) run as Privileged ++ 2) has CAP_SYS_ADMIN' + type: boolean + capabilities: +- description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. ++ description: The capabilities to add/drop when running containers. ++ Defaults to the default set of capabilities granted by ++ the container runtime. + properties: + add: + description: Added capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + drop: + description: Removed capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + type: object + privileged: +- description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. ++ description: Run container in privileged mode. Processes ++ in privileged containers are essentially equivalent to ++ root on the host. Defaults to false. + type: boolean + procMount: +- description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. ++ description: procMount denotes the type of proc mount to ++ use for the containers. The default is DefaultProcMount ++ which uses the container runtime defaults for readonly ++ paths and masked paths. This requires the ProcMountType ++ feature flag to be enabled. + type: string + readOnlyRootFilesystem: +- description: Whether this container has a read-only root filesystem. Default is false. ++ description: Whether this container has a read-only root ++ filesystem. Default is false. + type: boolean + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The GID to run the entrypoint of the container ++ process. Uses runtime default if unset. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a ++ non-root user. If true, the Kubelet will validate the ++ image at runtime to ensure that it does not run as UID ++ 0 (root) and fail to start the container if it does. If ++ unset or false, no such validation will be performed. ++ May also be set in PodSecurityContext. If set in both ++ SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UID to run the entrypoint of the container ++ process. Defaults to user specified in image metadata ++ if unspecified. May also be set in PodSecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The SELinux context to be applied to the container. ++ If unspecified, the container runtime will allocate a ++ random SELinux context for each container. May also be ++ set in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies ++ to the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies ++ to the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies ++ to the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies ++ to the container. + type: string + type: object + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all ++ containers. If unspecified, the options from the PodSecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named ++ by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the ++ GMSA credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + type: string + type: object + type: object + startupProbe: +- description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. This is a beta feature enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'StartupProbe indicates that the Pod has successfully ++ initialized. If specified, no other probes are executed until ++ this completes successfully. If this probe fails, the Pod ++ will be restarted, just as if the livenessProbe failed. This ++ can be used to provide different probe parameters at the beginning ++ of a Pod''s lifecycle, when it might take a long time to load ++ data or warm a cache, than during steady-state operation. ++ This cannot be updated. This is a beta feature enabled by ++ the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1012,71 +1573,117 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + stdin: +- description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false. ++ description: Whether this container should allocate a buffer ++ for stdin in the container runtime. If this is not set, reads ++ from stdin in the container will always result in EOF. Default ++ is false. + type: boolean + stdinOnce: +- description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false ++ description: Whether the container runtime should close the ++ stdin channel after it has been opened by a single attach. ++ When stdin is true the stdin stream will remain open across ++ multiple attach sessions. If stdinOnce is set to true, stdin ++ is opened on container start, is empty until the first client ++ attaches to stdin, and then remains open and accepts data ++ until the client disconnects, at which time stdin is closed ++ and remains closed until the container is restarted. If this ++ flag is false, a container processes that reads from stdin ++ will never receive an EOF. Default is false + type: boolean + terminationMessagePath: +- description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.' ++ description: 'Optional: Path at which the file to which the ++ container''s termination message will be written is mounted ++ into the container''s filesystem. Message written is intended ++ to be brief final status, such as an assertion failure message. ++ Will be truncated by the node if greater than 4096 bytes. ++ The total message length across all containers will be limited ++ to 12kb. Defaults to /dev/termination-log. Cannot be updated.' + type: string + terminationMessagePolicy: +- description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated. ++ description: Indicate how the termination message should be ++ populated. File will use the contents of terminationMessagePath ++ to populate the container status message on both success and ++ failure. FallbackToLogsOnError will use the last chunk of ++ container log output if the termination message file is empty ++ and the container exited with an error. The log output is ++ limited to 2048 bytes or 80 lines, whichever is smaller. Defaults ++ to File. Cannot be updated. + type: string + tty: +- description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false. ++ description: Whether this container should allocate a TTY for ++ itself, also requires 'stdin' to be true. Default is false. + type: boolean + volumeDevices: +- description: volumeDevices is the list of block devices to be used by the container. ++ description: volumeDevices is the list of block devices to be ++ used by the container. + items: +- description: volumeDevice describes a mapping of a raw block device within a container. ++ description: volumeDevice describes a mapping of a raw block ++ device within a container. + properties: + devicePath: +- description: devicePath is the path inside of the container that the device will be mapped to. ++ description: devicePath is the path inside of the container ++ that the device will be mapped to. + type: string + name: +- description: name must match the name of a persistentVolumeClaim in the pod ++ description: name must match the name of a persistentVolumeClaim ++ in the pod + type: string + required: + - devicePath +@@ -1084,27 +1691,40 @@ + type: object + type: array + volumeMounts: +- description: Pod volumes to mount into the container's filesystem. Cannot be updated. ++ description: Pod volumes to mount into the container's filesystem. ++ Cannot be updated. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume ++ within a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume ++ should be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are ++ propagated from the host to container and the other ++ way around. When not set, MountPropagationNone is used. ++ This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which ++ the container's volume should be mounted. Behaves similarly ++ to SubPath but environment variable references $(VAR_NAME) ++ are expanded using the container's environment. Defaults ++ to "" (volume's root). SubPathExpr and SubPath are mutually ++ exclusive. + type: string + required: + - mountPath +@@ -1112,23 +1732,32 @@ + type: object + type: array + workingDir: +- description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated. ++ description: Container's working directory. If not specified, ++ the container runtime's default will be used, which might ++ be configured in the container image. Cannot be updated. + type: string + required: + - name + type: object + type: array + enforcedNamespaceLabel: +- description: EnforcedNamespaceLabel enforces adding a namespace label of origin for each alert and metric that is user created. The label value will always be the namespace of the object that is being created. ++ description: EnforcedNamespaceLabel enforces adding a namespace label ++ of origin for each alert and metric that is user created. The label ++ value will always be the namespace of the object that is being created. + type: string + evaluationInterval: + description: Interval between consecutive evaluations. + type: string + externalPrefix: +- description: The external URL the Thanos Ruler instances will be available under. This is necessary to generate correct URLs. This is necessary if Thanos Ruler is not served from root of a DNS name. ++ description: The external URL the Thanos Ruler instances will be available ++ under. This is necessary to generate correct URLs. This is necessary ++ if Thanos Ruler is not served from root of a DNS name. + type: string + grpcServerTlsConfig: +- description: 'GRPCServerTLSConfig configures the gRPC server from which Thanos Querier reads recorded rule data. Note: Currently only the CAFile, CertFile, and KeyFile fields are supported. Maps to the ''--grpc-server-tls-*'' CLI args.' ++ description: 'GRPCServerTLSConfig configures the gRPC server from ++ which Thanos Querier reads recorded rule data. Note: Currently only ++ the CAFile, CertFile, and KeyFile fields are supported. Maps to ++ the ''--grpc-server-tls-*'' CLI args.' + properties: + ca: + description: Struct containing the CA cert to use for the targets. +@@ -1140,10 +1769,12 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its key ++ must be defined + type: boolean + required: + - key +@@ -1152,20 +1783,24 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + type: object + caFile: +- description: Path to the CA cert in the Prometheus container to use for the targets. ++ description: Path to the CA cert in the Prometheus container to ++ use for the targets. + type: string + cert: + description: Struct containing the client cert file for the targets. +@@ -1177,10 +1812,12 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or its key ++ must be defined + type: boolean + required: + - key +@@ -1189,38 +1826,46 @@ + description: Secret containing data to use for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must ++ be defined + type: boolean + required: + - key + type: object + type: object + certFile: +- description: Path to the client cert file in the Prometheus container for the targets. ++ description: Path to the client cert file in the Prometheus container ++ for the targets. + type: string + insecureSkipVerify: + description: Disable target certificate validation. + type: boolean + keyFile: +- description: Path to the client key file in the Prometheus container for the targets. ++ description: Path to the client key file in the Prometheus container ++ for the targets. + type: string + keySecret: + description: Secret containing the client key file for the targets. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be ++ a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its key must be ++ defined + type: boolean + required: + - key +@@ -1233,43 +1878,80 @@ + description: Thanos container image URL. + type: string + imagePullSecrets: +- description: An optional list of references to secrets in the same namespace to use for pulling thanos images from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod ++ description: An optional list of references to secrets in the same ++ namespace to use for pulling thanos images from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod + items: +- description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace. ++ description: LocalObjectReference contains enough information to ++ let you locate the referenced object inside the same namespace. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + type: array + initContainers: +- description: 'InitContainers allows adding initContainers to the pod definition. Those can be used to e.g. fetch secrets for injection into the ThanosRuler configuration from external sources. Any errors during the execution of an initContainer will lead to a restart of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ Using initContainers for any use case other then secret fetching is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice.' ++ description: 'InitContainers allows adding initContainers to the pod ++ definition. Those can be used to e.g. fetch secrets for injection ++ into the ThanosRuler configuration from external sources. Any errors ++ during the execution of an initContainer will lead to a restart ++ of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ++ Using initContainers for any use case other then secret fetching ++ is entirely outside the scope of what the maintainers will support ++ and by doing so, you accept that this behaviour may break at any ++ time without notice.' + items: +- description: A single application container that you want to run within a pod. ++ description: A single application container that you want to run ++ within a pod. + properties: + args: +- description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Arguments to the entrypoint. The docker image''s ++ CMD is used if this is not provided. Variable references $(VAR_NAME) ++ are expanded using the container''s environment. If a variable ++ cannot be resolved, the reference in the input string will ++ be unchanged. The $(VAR_NAME) syntax can be escaped with a ++ double $$, ie: $$(VAR_NAME). Escaped references will never ++ be expanded, regardless of whether the variable exists or ++ not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + command: +- description: 'Entrypoint array. Not executed within a shell. The docker image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' ++ description: 'Entrypoint array. Not executed within a shell. ++ The docker image''s ENTRYPOINT is used if this is not provided. ++ Variable references $(VAR_NAME) are expanded using the container''s ++ environment. If a variable cannot be resolved, the reference ++ in the input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether the ++ variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell' + items: + type: string + type: array + env: +- description: List of environment variables to set in the container. Cannot be updated. ++ description: List of environment variables to set in the container. ++ Cannot be updated. + items: +- description: EnvVar represents an environment variable present in a Container. ++ description: EnvVar represents an environment variable present ++ in a Container. + properties: + name: +- description: Name of the environment variable. Must be a C_IDENTIFIER. ++ description: Name of the environment variable. Must be ++ a C_IDENTIFIER. + type: string + value: +- description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' ++ description: 'Variable references $(VAR_NAME) are expanded ++ using the previous defined environment variables in ++ the container and any service environment variables. ++ If a variable cannot be resolved, the reference in the ++ input string will be unchanged. The $(VAR_NAME) syntax ++ can be escaped with a double $$, ie: $$(VAR_NAME). Escaped ++ references will never be expanded, regardless of whether ++ the variable exists or not. Defaults to "".' + type: string + valueFrom: +- description: Source for the environment variable's value. Cannot be used if value is not empty. ++ description: Source for the environment variable's value. ++ Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. +@@ -1278,37 +1960,52 @@ + description: The key to select. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its key must be defined ++ description: Specify whether the ConfigMap or ++ its key must be defined + type: boolean + required: + - key + type: object + fieldRef: +- description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' ++ description: 'Selects a field of the pod: supports ++ metadata.name, metadata.namespace, metadata.labels, ++ metadata.annotations, spec.nodeName, spec.serviceAccountName, ++ status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, limits.ephemeral-storage, requests.cpu, ++ requests.memory and requests.ephemeral-storage) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -1318,16 +2015,22 @@ + - resource + type: object + secretKeyRef: +- description: Selects a key of a secret in the pod's namespace ++ description: Selects a key of a secret in the pod's ++ namespace + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must ++ be a valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + required: + - key +@@ -1338,28 +2041,41 @@ + type: object + type: array + envFrom: +- description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated. ++ description: List of sources to populate environment variables ++ in the container. The keys defined within a source must be ++ a C_IDENTIFIER. All invalid keys will be reported as an event ++ when the container is starting. When a key exists in multiple ++ sources, the value associated with the last source will take ++ precedence. Values defined by an Env with a duplicate key ++ will take precedence. Cannot be updated. + items: +- description: EnvFromSource represents the source of a set of ConfigMaps ++ description: EnvFromSource represents the source of a set ++ of ConfigMaps + properties: + configMapRef: + description: The ConfigMap to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap must be defined ++ description: Specify whether the ConfigMap must be ++ defined + type: boolean + type: object + prefix: +- description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. ++ description: An optional identifier to prepend to each ++ key in the ConfigMap. Must be a C_IDENTIFIER. + type: string + secretRef: + description: The Secret to select from + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: + description: Specify whether the Secret must be defined +@@ -1368,22 +2084,41 @@ + type: object + type: array + image: +- description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' ++ description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images ++ This field is optional to allow higher level config management ++ to default or override container images in workload controllers ++ like Deployments and StatefulSets.' + type: string + imagePullPolicy: +- description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' ++ description: 'Image pull policy. One of Always, Never, IfNotPresent. ++ Defaults to Always if :latest tag is specified, or IfNotPresent ++ otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images' + type: string + lifecycle: +- description: Actions that the management system should take in response to container lifecycle events. Cannot be updated. ++ description: Actions that the management system should take ++ in response to container lifecycle events. Cannot be updated. + properties: + postStart: +- description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PostStart is called immediately after a container ++ is created. If the handler fails, the container is terminated ++ and restarted according to its restart policy. 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: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -1392,12 +2127,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1417,38 +2156,66 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + type: object + preStop: +- description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The reason for termination is passed to the handler. The Pod''s termination grace period countdown begins before the PreStop hooked is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period. Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' ++ description: 'PreStop is called immediately before a container ++ is terminated due to an API request or management event ++ such as liveness/startup probe failure, preemption, resource ++ contention, etc. The handler is not called if the container ++ crashes or exits. The reason for termination is passed ++ to the handler. The Pod''s termination grace period countdown ++ begins before the PreStop hooked is executed. Regardless ++ of the outcome of the handler, the container will eventually ++ terminate within the Pod''s termination grace period. ++ Other management of the container blocks until the hook ++ completes or until the termination grace period is reached. ++ More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should ++ be specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for ++ the command is root ('/') in the container's ++ filesystem. The command is simply exec'd, it is ++ not run inside a shell, so traditional shell instructions ++ ('|', etc) won't work. To use a shell, you need ++ to explicitly call out to that shell. Exit status ++ of 0 is treated as live/healthy and non-zero is ++ unhealthy. + items: + type: string + type: array +@@ -1457,12 +2224,16 @@ + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to ++ the pod IP. You probably want to set "Host" in ++ httpHeaders instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. ++ HTTP allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1482,25 +2253,33 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the ++ host. Defaults to HTTP. + type: string + required: + - port + type: object + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving ++ a TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, ++ defaults to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access ++ on the container. Number must be in the range ++ 1 to 65535. Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port +@@ -1508,31 +2287,47 @@ + type: object + type: object + livenessProbe: +- description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container liveness. Container ++ will be restarted if the probe fails. Cannot be updated. More ++ info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1552,71 +2347,104 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + name: +- description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated. ++ description: Name of the container specified as a DNS_LABEL. ++ Each container in a pod must have a unique name (DNS_LABEL). ++ Cannot be updated. + type: string + ports: +- description: List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. ++ description: List of ports to expose from the container. Exposing ++ a port here gives the system additional information about ++ the network connections a container uses, but is primarily ++ informational. Not specifying a port here DOES NOT prevent ++ that port from being exposed. Any port which is listening ++ on the default "0.0.0.0" address inside a container will be ++ accessible from the network. Cannot be updated. + items: +- description: ContainerPort represents a network port in a single container. ++ description: ContainerPort represents a network port in a ++ single container. + properties: + containerPort: +- description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536. ++ description: Number of port to expose on the pod's IP ++ address. This must be a valid port number, 0 < x < 65536. + format: int32 + type: integer + hostIP: + description: What host IP to bind the external port to. + type: string + hostPort: +- description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. ++ description: Number of port to expose on the host. If ++ specified, this must be a valid port number, 0 < x < ++ 65536. If HostNetwork is specified, this must match ++ ContainerPort. Most containers do not need this. + format: int32 + type: integer + name: +- description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. ++ description: If specified, this must be an IANA_SVC_NAME ++ and unique within the pod. Each named port in a pod ++ must have a unique name. Name for the port that can ++ be referred to by services. + type: string + protocol: + default: TCP +- description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP". ++ description: Protocol for port. Must be UDP, TCP, or SCTP. ++ Defaults to "TCP". + type: string + required: + - containerPort +@@ -1627,31 +2455,47 @@ + - protocol + x-kubernetes-list-type: map + readinessProbe: +- description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Periodic probe of container service readiness. ++ Container will be removed from service endpoints if the probe ++ fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1671,48 +2515,65 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + resources: +- description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Compute Resources required by this container. ++ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + properties: + limits: + additionalProperties: +@@ -1721,7 +2582,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute ++ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -1730,107 +2592,187 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, ++ otherwise to an implementation-defined value. More info: ++ https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + securityContext: +- description: 'Security options the pod should run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' ++ description: 'Security options the pod should run with. More ++ info: https://kubernetes.io/docs/concepts/policy/security-context/ ++ More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/' + properties: + allowPrivilegeEscalation: +- description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN' ++ description: 'AllowPrivilegeEscalation controls whether ++ a process can gain more privileges than its parent process. ++ This bool directly controls if the no_new_privs flag will ++ be set on the container process. AllowPrivilegeEscalation ++ is true always when the container is: 1) run as Privileged ++ 2) has CAP_SYS_ADMIN' + type: boolean + capabilities: +- description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. ++ description: The capabilities to add/drop when running containers. ++ Defaults to the default set of capabilities granted by ++ the container runtime. + properties: + add: + description: Added capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + drop: + description: Removed capabilities + items: +- description: Capability represent POSIX capabilities type ++ description: Capability represent POSIX capabilities ++ type + type: string + type: array + type: object + privileged: +- description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. ++ description: Run container in privileged mode. Processes ++ in privileged containers are essentially equivalent to ++ root on the host. Defaults to false. + type: boolean + procMount: +- description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. ++ description: procMount denotes the type of proc mount to ++ use for the containers. The default is DefaultProcMount ++ which uses the container runtime defaults for readonly ++ paths and masked paths. This requires the ProcMountType ++ feature flag to be enabled. + type: string + readOnlyRootFilesystem: +- description: Whether this container has a read-only root filesystem. Default is false. ++ description: Whether this container has a read-only root ++ filesystem. Default is false. + type: boolean + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The GID to run the entrypoint of the container ++ process. Uses runtime default if unset. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a ++ non-root user. If true, the Kubelet will validate the ++ image at runtime to ensure that it does not run as UID ++ 0 (root) and fail to start the container if it does. If ++ unset or false, no such validation will be performed. ++ May also be set in PodSecurityContext. If set in both ++ SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UID to run the entrypoint of the container ++ process. Defaults to user specified in image metadata ++ if unspecified. May also be set in PodSecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The SELinux context to be applied to the container. ++ If unspecified, the container runtime will allocate a ++ random SELinux context for each container. May also be ++ set in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies ++ to the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies ++ to the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies ++ to the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies ++ to the container. + type: string + type: object + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all ++ containers. If unspecified, the options from the PodSecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named ++ by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the ++ GMSA credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set ++ in PodSecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence. + type: string + type: object + type: object + startupProbe: +- description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. This is a beta feature enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'StartupProbe indicates that the Pod has successfully ++ initialized. If specified, no other probes are executed until ++ this completes successfully. If this probe fails, the Pod ++ will be restarted, just as if the livenessProbe failed. This ++ can be used to provide different probe parameters at the beginning ++ of a Pod''s lifecycle, when it might take a long time to load ++ data or warm a cache, than during steady-state operation. ++ This cannot be updated. This is a beta feature enabled by ++ the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + properties: + exec: +- description: One and only one of the following should be specified. Exec specifies the action to take. ++ description: One and only one of the following should be ++ specified. Exec specifies the action to take. + properties: + command: +- description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. ++ description: Command is the command line to execute ++ inside the container, the working directory for the ++ command is root ('/') in the container's filesystem. ++ The command is simply exec'd, it is not run inside ++ a shell, so traditional shell instructions ('|', etc) ++ won't work. To use a shell, you need to explicitly ++ call out to that shell. Exit status of 0 is treated ++ as live/healthy and non-zero is unhealthy. + items: + type: string + type: array + type: object + failureThreshold: +- description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. ++ description: Minimum consecutive failures for the probe ++ to be considered failed after having succeeded. Defaults ++ to 3. Minimum value is 1. + format: int32 + type: integer + httpGet: + description: HTTPGet specifies the http request to perform. + properties: + host: +- description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. ++ description: Host name to connect to, defaults to the ++ pod IP. You probably want to set "Host" in httpHeaders ++ instead. + type: string + httpHeaders: +- description: Custom headers to set in the request. HTTP allows repeated headers. ++ description: Custom headers to set in the request. HTTP ++ allows repeated headers. + items: +- description: HTTPHeader describes a custom header to be used in HTTP probes ++ description: HTTPHeader describes a custom header ++ to be used in HTTP probes + properties: + name: + description: The header field name +@@ -1850,71 +2792,117 @@ + anyOf: + - type: integer + - type: string +- description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Name or number of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + scheme: +- description: Scheme to use for connecting to the host. Defaults to HTTP. ++ description: Scheme to use for connecting to the host. ++ Defaults to HTTP. + type: string + required: + - port + type: object + initialDelaySeconds: +- description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after the container has ++ started before liveness probes are initiated. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + periodSeconds: +- description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. ++ description: How often (in seconds) to perform the probe. ++ Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: +- description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. ++ description: Minimum consecutive successes for the probe ++ to be considered successful after having failed. Defaults ++ to 1. Must be 1 for liveness and startup. Minimum value ++ is 1. + format: int32 + type: integer + tcpSocket: +- description: 'TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported TODO: implement a realistic TCP lifecycle hook' ++ description: 'TCPSocket specifies an action involving a ++ TCP port. TCP hooks not yet supported TODO: implement ++ a realistic TCP lifecycle hook' + properties: + host: +- description: 'Optional: Host name to connect to, defaults to the pod IP.' ++ description: 'Optional: Host name to connect to, defaults ++ to the pod IP.' + type: string + port: + anyOf: + - type: integer + - type: string +- description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. ++ description: Number or name of the port to access on ++ the container. Number must be in the range 1 to 65535. ++ Name must be an IANA_SVC_NAME. + x-kubernetes-int-or-string: true + required: + - port + type: object + timeoutSeconds: +- description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' ++ description: 'Number of seconds after which the probe times ++ out. Defaults to 1 second. Minimum value is 1. More info: ++ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' + format: int32 + type: integer + type: object + stdin: +- description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false. ++ description: Whether this container should allocate a buffer ++ for stdin in the container runtime. If this is not set, reads ++ from stdin in the container will always result in EOF. Default ++ is false. + type: boolean + stdinOnce: +- description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false ++ description: Whether the container runtime should close the ++ stdin channel after it has been opened by a single attach. ++ When stdin is true the stdin stream will remain open across ++ multiple attach sessions. If stdinOnce is set to true, stdin ++ is opened on container start, is empty until the first client ++ attaches to stdin, and then remains open and accepts data ++ until the client disconnects, at which time stdin is closed ++ and remains closed until the container is restarted. If this ++ flag is false, a container processes that reads from stdin ++ will never receive an EOF. Default is false + type: boolean + terminationMessagePath: +- description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.' ++ description: 'Optional: Path at which the file to which the ++ container''s termination message will be written is mounted ++ into the container''s filesystem. Message written is intended ++ to be brief final status, such as an assertion failure message. ++ Will be truncated by the node if greater than 4096 bytes. ++ The total message length across all containers will be limited ++ to 12kb. Defaults to /dev/termination-log. Cannot be updated.' + type: string + terminationMessagePolicy: +- description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated. ++ description: Indicate how the termination message should be ++ populated. File will use the contents of terminationMessagePath ++ to populate the container status message on both success and ++ failure. FallbackToLogsOnError will use the last chunk of ++ container log output if the termination message file is empty ++ and the container exited with an error. The log output is ++ limited to 2048 bytes or 80 lines, whichever is smaller. Defaults ++ to File. Cannot be updated. + type: string + tty: +- description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false. ++ description: Whether this container should allocate a TTY for ++ itself, also requires 'stdin' to be true. Default is false. + type: boolean + volumeDevices: +- description: volumeDevices is the list of block devices to be used by the container. ++ description: volumeDevices is the list of block devices to be ++ used by the container. + items: +- description: volumeDevice describes a mapping of a raw block device within a container. ++ description: volumeDevice describes a mapping of a raw block ++ device within a container. + properties: + devicePath: +- description: devicePath is the path inside of the container that the device will be mapped to. ++ description: devicePath is the path inside of the container ++ that the device will be mapped to. + type: string + name: +- description: name must match the name of a persistentVolumeClaim in the pod ++ description: name must match the name of a persistentVolumeClaim ++ in the pod + type: string + required: + - devicePath +@@ -1922,27 +2910,40 @@ + type: object + type: array + volumeMounts: +- description: Pod volumes to mount into the container's filesystem. Cannot be updated. ++ description: Pod volumes to mount into the container's filesystem. ++ Cannot be updated. + items: +- description: VolumeMount describes a mounting of a Volume within a container. ++ description: VolumeMount describes a mounting of a Volume ++ within a container. + properties: + mountPath: +- description: Path within the container at which the volume should be mounted. Must not contain ':'. ++ description: Path within the container at which the volume ++ should be mounted. Must not contain ':'. + type: string + mountPropagation: +- description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. ++ description: mountPropagation determines how mounts are ++ propagated from the host to container and the other ++ way around. When not set, MountPropagationNone is used. ++ This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: +- description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. ++ description: Mounted read-only if true, read-write otherwise ++ (false or unspecified). Defaults to false. + type: boolean + subPath: +- description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). ++ description: Path within the volume from which the container's ++ volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: +- description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. ++ description: Expanded path within the volume from which ++ the container's volume should be mounted. Behaves similarly ++ to SubPath but environment variable references $(VAR_NAME) ++ are expanded using the container's environment. Defaults ++ to "" (volume's root). SubPathExpr and SubPath are mutually ++ exclusive. + type: string + required: + - mountPath +@@ -1950,7 +2951,9 @@ + type: object + type: array + workingDir: +- description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated. ++ description: Container's working directory. If not specified, ++ the container runtime's default will be used, which might ++ be configured in the container image. Cannot be updated. + type: string + required: + - name +@@ -1959,10 +2962,13 @@ + labels: + additionalProperties: + type: string +- description: Labels configure the external label pairs to ThanosRuler. If not provided, default replica label `thanos_ruler_replica` will be added as a label and be dropped in alerts. ++ description: Labels configure the external label pairs to ThanosRuler. ++ If not provided, default replica label `thanos_ruler_replica` will ++ be added as a label and be dropped in alerts. + type: object + listenLocal: +- description: ListenLocal makes the Thanos ruler listen on loopback, so that it does not bind against the Pod IP. ++ description: ListenLocal makes the Thanos ruler listen on loopback, ++ so that it does not bind against the Pod IP. + type: boolean + logFormat: + description: Log format for ThanosRuler to be configured with. +@@ -1976,13 +2982,16 @@ + 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. ++ description: ObjectStorageConfig configures object storage in Thanos. ++ Alternative to ObjectStorageConfigFile, and lower order priority. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -1991,38 +3000,58 @@ + - key + type: object + objectStorageConfigFile: +- description: ObjectStorageConfigFile specifies the path of the object storage configuration file. When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence. ++ description: ObjectStorageConfigFile specifies the path of the object ++ storage configuration file. When used alongside with ObjectStorageConfig, ++ ObjectStorageConfigFile takes precedence. + type: string + paused: +- description: When a ThanosRuler deployment is paused, no actions except for deletion will be performed on the underlying objects. ++ description: When a ThanosRuler deployment is paused, no actions except ++ for deletion will be performed on the underlying objects. + type: boolean + podMetadata: +- description: PodMetadata contains Labels and Annotations gets propagated to the thanos ruler pods. ++ description: PodMetadata contains Labels and Annotations gets propagated ++ to the thanos ruler pods. + properties: + annotations: + additionalProperties: + type: string +- description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' ++ description: 'Annotations is an unstructured key value map stored ++ with a resource that may be set by external tools to store and ++ retrieve arbitrary metadata. They are not queryable and should ++ be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string +- description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' ++ description: 'Map of string keys and values that can be used to ++ organize and categorize (scope and select) objects. May match ++ selectors of replication controllers and services. More info: ++ http://kubernetes.io/docs/user-guide/labels' + type: object + name: +- description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' ++ description: 'Name must be unique within a namespace. Is required ++ when creating resources, although some resources may allow a ++ client to request the generation of an appropriate name automatically. ++ Name is primarily intended for creation idempotence and configuration ++ definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + type: object + portName: +- description: Port name used for the pods and governing service. This defaults to web ++ description: Port name used for the pods and governing service. This ++ defaults to web + type: string + priorityClassName: + description: Priority class assigned to the Pods + type: string + prometheusRulesExcludedFromEnforce: +- description: PrometheusRulesExcludedFromEnforce - list of Prometheus rules to be excluded from enforcing of adding namespace labels. Works only if enforcedNamespaceLabel set to true. Make sure both ruleNamespace and ruleName are set for each pair ++ description: PrometheusRulesExcludedFromEnforce - list of Prometheus ++ rules to be excluded from enforcing of adding namespace labels. ++ Works only if enforcedNamespaceLabel set to true. Make sure both ++ ruleNamespace and ruleName are set for each pair + items: +- description: PrometheusRuleExcludeConfig enables users to configure excluded PrometheusRule names and their namespaces to be ignored while enforcing namespace label for alerts and metrics. ++ description: PrometheusRuleExcludeConfig enables users to configure ++ excluded PrometheusRule names and their namespaces to be ignored ++ while enforcing namespace label for alerts and metrics. + properties: + ruleName: + description: RuleNamespace - name of excluded rule +@@ -2036,13 +3065,18 @@ + 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. ++ 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. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -2051,7 +3085,8 @@ + - key + type: object + queryEndpoints: +- description: QueryEndpoints defines Thanos querier endpoints from which to query metrics. Maps to the --query flag of thanos ruler. ++ description: QueryEndpoints defines Thanos querier endpoints from ++ which to query metrics. Maps to the --query flag of thanos ruler. + items: + type: string + type: array +@@ -2060,7 +3095,8 @@ + format: int32 + type: integer + resources: +- description: Resources defines the resource requirements for single Pods. If not provided, no requests/limits will be set ++ description: Resources defines the resource requirements for single ++ Pods. If not provided, no requests/limits will be set + properties: + limits: + additionalProperties: +@@ -2069,7 +3105,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount of compute resources ++ allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -2078,31 +3115,48 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount of compute ++ resources required. If Requests is omitted for a container, ++ it defaults to Limits if that is explicitly specified, otherwise ++ to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + retention: +- description: Time duration ThanosRuler shall retain data for. Default is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` (milliseconds seconds minutes hours days weeks years). ++ description: Time duration ThanosRuler shall retain data for. Default ++ is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` ++ (milliseconds seconds minutes hours days weeks years). + type: string + routePrefix: +- description: The route prefix ThanosRuler registers HTTP handlers for. This allows thanos UI to be served on a sub-path. ++ description: The route prefix ThanosRuler registers HTTP handlers ++ for. This allows thanos UI to be served on a sub-path. + type: string + ruleNamespaceSelector: +- description: Namespaces to be selected for Rules discovery. If unspecified, only the same namespace as the ThanosRuler object is in is used. ++ description: Namespaces to be selected for Rules discovery. If unspecified, ++ only the same namespace as the ThanosRuler object is in is used. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2114,25 +3168,40 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + ruleSelector: +- description: A label selector to select which PrometheusRules to mount for alerting and recording. ++ description: A label selector to select which PrometheusRules to mount ++ for alerting and recording. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector requirements. ++ The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector that ++ contains values, a key, and an operator that relates the key ++ and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector applies ++ to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship to ++ a set of values. Valid operators are In, NotIn, Exists ++ and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. If the ++ operator is In or NotIn, the values array must be non-empty. ++ If the operator is Exists or DoesNotExist, the values ++ array must be empty. This array is replaced during a strategic ++ merge patch. + items: + type: string + type: array +@@ -2144,54 +3213,97 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. A single ++ {key,value} in the matchLabels map is equivalent to an element ++ of matchExpressions, whose key field is "key", the operator ++ is "In", and the values array contains only "value". The requirements ++ are ANDed. + type: object + type: object + securityContext: +- description: SecurityContext holds pod-level security attributes and common container settings. This defaults to the default PodSecurityContext. ++ description: SecurityContext holds pod-level security attributes and ++ common container settings. This defaults to the default PodSecurityContext. + properties: + fsGroup: +- description: "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: \n 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- \n If unset, the Kubelet will not modify the ownership and permissions of any volume." ++ description: "A special supplemental group that applies to all ++ containers in a pod. Some volume types allow the Kubelet to ++ change the ownership of that volume to be owned by the pod: ++ \n 1. The owning GID will be the FSGroup 2. The setgid bit is ++ set (new files created in the volume will be owned by FSGroup) ++ 3. The permission bits are OR'd with rw-rw---- \n If unset, ++ the Kubelet will not modify the ownership and permissions of ++ any volume." + format: int64 + type: integer + fsGroupChangePolicy: +- description: 'fsGroupChangePolicy defines behavior of changing ownership and permission of the volume before being exposed inside Pod. This field will only apply to volume types which support fsGroup based ownership(and permissions). It will have no effect on ephemeral volume types such as: secret, configmaps and emptydir. Valid values are "OnRootMismatch" and "Always". If not specified defaults to "Always".' ++ description: 'fsGroupChangePolicy defines behavior of changing ++ ownership and permission of the volume before being exposed ++ inside Pod. This field will only apply to volume types which ++ support fsGroup based ownership(and permissions). It will have ++ no effect on ephemeral volume types such as: secret, configmaps ++ and emptydir. Valid values are "OnRootMismatch" and "Always". ++ If not specified defaults to "Always".' + type: string + runAsGroup: +- description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The GID to run the entrypoint of the container process. ++ Uses runtime default if unset. May also be set in SecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the value ++ specified in SecurityContext takes precedence for that container. + format: int64 + type: integer + runAsNonRoot: +- description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: Indicates that the container must run as a non-root ++ user. If true, the Kubelet will validate the image at runtime ++ to ensure that it does not run as UID 0 (root) and fail to start ++ the container if it does. If unset or false, no such validation ++ will be performed. May also be set in SecurityContext. If set ++ in both SecurityContext and PodSecurityContext, the value specified ++ in SecurityContext takes precedence. + type: boolean + runAsUser: +- description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The UID to run the entrypoint of the container process. ++ Defaults to user specified in image metadata if unspecified. ++ May also be set in SecurityContext. If set in both SecurityContext ++ and PodSecurityContext, the value specified in SecurityContext ++ takes precedence for that container. + format: int64 + type: integer + seLinuxOptions: +- description: The SELinux context to be applied to all containers. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. ++ description: The SELinux context to be applied to all containers. ++ If unspecified, the container runtime will allocate a random ++ SELinux context for each container. May also be set in SecurityContext. If ++ set in both SecurityContext and PodSecurityContext, the value ++ specified in SecurityContext takes precedence for that container. + properties: + level: +- description: Level is SELinux level label that applies to the container. ++ description: Level is SELinux level label that applies to ++ the container. + type: string + role: +- description: Role is a SELinux role label that applies to the container. ++ description: Role is a SELinux role label that applies to ++ the container. + type: string + type: +- description: Type is a SELinux type label that applies to the container. ++ description: Type is a SELinux type label that applies to ++ the container. + type: string + user: +- description: User is a SELinux user label that applies to the container. ++ description: User is a SELinux user label that applies to ++ the container. + type: string + type: object + supplementalGroups: +- description: A list of groups applied to the first process run in each container, in addition to the container's primary GID. If unspecified, no groups will be added to any container. ++ description: A list of groups applied to the first process run ++ in each container, in addition to the container's primary GID. If ++ unspecified, no groups will be added to any container. + items: + format: int64 + type: integer + type: array + sysctls: +- description: Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported sysctls (by the container runtime) might fail to launch. ++ description: Sysctls hold a list of namespaced sysctls used for ++ the pod. Pods with unsupported sysctls (by the container runtime) ++ might fail to launch. + items: + description: Sysctl defines a kernel parameter to be set + properties: +@@ -2207,39 +3319,64 @@ + type: object + type: array + windowsOptions: +- description: The Windows specific settings applied to all containers. If unspecified, the options within a container's SecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The Windows specific settings applied to all containers. ++ If unspecified, the options within a container's SecurityContext ++ will be used. If set in both SecurityContext and PodSecurityContext, ++ the value specified in SecurityContext takes precedence. + properties: + gmsaCredentialSpec: +- description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field. ++ description: GMSACredentialSpec is where the GMSA admission ++ webhook (https://github.com/kubernetes-sigs/windows-gmsa) ++ inlines the contents of the GMSA credential spec named by ++ the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: +- description: GMSACredentialSpecName is the name of the GMSA credential spec to use. ++ description: GMSACredentialSpecName is the name of the GMSA ++ credential spec to use. + type: string + runAsUserName: +- description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. ++ description: The UserName in Windows to run the entrypoint ++ of the container process. Defaults to the user specified ++ in image metadata if unspecified. May also be set in PodSecurityContext. ++ If set in both SecurityContext and PodSecurityContext, the ++ value specified in SecurityContext takes precedence. + type: string + type: object + type: object + serviceAccountName: +- description: ServiceAccountName is the name of the ServiceAccount to use to run the Thanos Ruler Pods. ++ description: ServiceAccountName is the name of the ServiceAccount ++ to use to run the Thanos Ruler Pods. + type: string + storage: + description: Storage spec to specify how storage shall be used. + properties: + disableMountSubPath: +- description: 'Deprecated: subPath usage will be disabled by default in a future release, this option will become unnecessary. DisableMountSubPath allows to remove any subPath usage in volume mounts.' ++ description: 'Deprecated: subPath usage will be disabled by default ++ in a future release, this option will become unnecessary. DisableMountSubPath ++ allows to remove any subPath usage in volume mounts.' + type: boolean + emptyDir: +- description: 'EmptyDirVolumeSource to be used by the Prometheus StatefulSets. If specified, used in place of any volumeClaimTemplate. More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir' ++ description: 'EmptyDirVolumeSource to be used by the Prometheus ++ StatefulSets. If specified, used in place of any volumeClaimTemplate. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir' + properties: + medium: +- description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'What type of storage medium should back this ++ directory. The default is "" which means to use the node''s ++ default medium. Must be an empty string (default) or Memory. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + type: string + sizeLimit: + anyOf: + - type: integer + - type: string +- description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' ++ description: 'Total amount of local storage required for this ++ EmptyDir volume. The size limit is also applicable for memory ++ medium. The maximum usage on memory medium EmptyDir would ++ be the minimum value between the SizeLimit specified here ++ and the sum of memory limits of all containers in a pod. ++ The default is nil which means that the limit is undefined. ++ More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object +@@ -2247,41 +3384,79 @@ + description: A PVC spec to be used by the Prometheus StatefulSets. + properties: + apiVersion: +- description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' ++ description: 'APIVersion defines the versioned schema of this ++ representation of an object. Servers should convert recognized ++ schemas to the latest internal value, and may reject unrecognized ++ values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: +- description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' ++ description: 'Kind is a string value representing the REST ++ resource this object represents. Servers may infer this ++ from the endpoint the client submits requests to. Cannot ++ be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: +- description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource. ++ description: EmbeddedMetadata contains metadata relevant to ++ an EmbeddedResource. + properties: + annotations: + additionalProperties: + type: string +- description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' ++ description: 'Annotations is an unstructured key value ++ map stored with a resource that may be set by external ++ tools to store and retrieve arbitrary metadata. They ++ are not queryable and should be preserved when modifying ++ objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + labels: + additionalProperties: + type: string +- description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' ++ description: 'Map of string keys and values that can be ++ used to organize and categorize (scope and select) objects. ++ May match selectors of replication controllers and services. ++ More info: http://kubernetes.io/docs/user-guide/labels' + type: object + name: +- description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' ++ description: 'Name must be unique within a namespace. ++ Is required when creating resources, although some resources ++ may allow a client to request the generation of an appropriate ++ name automatically. Name is primarily intended for creation ++ idempotence and configuration definition. Cannot be ++ updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + type: object + spec: +- description: 'Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'Spec defines the desired characteristics of ++ a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + accessModes: +- description: 'AccessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' ++ description: 'AccessModes contains the desired access ++ modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' + items: + type: string + type: array + dataSource: +- description: 'This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot - Beta) * An existing PVC (PersistentVolumeClaim) * An existing custom resource/object that implements data population (Alpha) In order to use VolumeSnapshot object types, the appropriate feature gate must be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. If the specified data source is not supported, the volume will not be created and the failure will be reported as an event. In the future, we plan to support more data source types and the behavior of the provisioner may change.' ++ description: 'This field can be used to specify either: ++ * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot ++ - Beta) * An existing PVC (PersistentVolumeClaim) * ++ An existing custom resource/object that implements data ++ population (Alpha) In order to use VolumeSnapshot object ++ types, the appropriate feature gate must be enabled ++ (VolumeSnapshotDataSource or AnyVolumeDataSource) If ++ the provisioner or an external controller can support ++ the specified data source, it will create a new volume ++ based on the contents of the specified data source. ++ If the specified data source is not supported, the volume ++ will not be created and the failure will be reported ++ as an event. In the future, we plan to support more ++ data source types and the behavior of the provisioner ++ may change.' + properties: + apiGroup: +- description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required. ++ description: APIGroup is the group for the resource ++ being referenced. If APIGroup is not specified, ++ the specified Kind must be in the core API group. ++ For any other third-party types, APIGroup is required. + type: string + kind: + description: Kind is the type of resource being referenced +@@ -2294,7 +3469,8 @@ + - name + type: object + resources: +- description: 'Resources represents the minimum resources the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' ++ description: 'Resources represents the minimum resources ++ the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' + properties: + limits: + additionalProperties: +@@ -2303,7 +3479,8 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Limits describes the maximum amount ++ of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: +@@ -2312,25 +3489,41 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' ++ description: 'Requests describes the minimum amount ++ of compute resources required. If Requests is omitted ++ for a container, it defaults to Limits if that is ++ explicitly specified, otherwise to an implementation-defined ++ value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + selector: +- description: A label query over volumes to consider for binding. ++ description: A label query over volumes to consider for ++ binding. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that ++ relates the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, ++ NotIn, Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values ++ array must be non-empty. If the operator is ++ Exists or DoesNotExist, the values array must ++ be empty. This array is replaced during a ++ strategic merge patch. + items: + type: string + type: array +@@ -2342,24 +3535,34 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field ++ is "key", the operator is "In", and the values array ++ contains only "value". The requirements are ANDed. + type: object + type: object + storageClassName: +- description: 'Name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' ++ description: 'Name of the StorageClass required by the ++ claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string + volumeMode: +- description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. ++ description: volumeMode defines what type of volume is ++ required by the claim. Value of Filesystem is implied ++ when not included in claim spec. + type: string + volumeName: +- description: VolumeName is the binding reference to the PersistentVolume backing this claim. ++ description: VolumeName is the binding reference to the ++ PersistentVolume backing this claim. + type: string + type: object + status: +- description: 'Status represents the current information/status of a persistent volume claim. Read-only. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'Status represents the current information/status ++ of a persistent volume claim. Read-only. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + accessModes: +- description: 'AccessModes contains the actual access modes the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' ++ description: 'AccessModes contains the actual access modes ++ the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' + items: + type: string + type: array +@@ -2370,31 +3573,42 @@ + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true +- description: Represents the actual resources of the underlying volume. ++ description: Represents the actual resources of the underlying ++ volume. + type: object + conditions: +- description: Current Condition of persistent volume claim. If underlying persistent volume is being resized then the Condition will be set to 'ResizeStarted'. ++ description: Current Condition of persistent volume claim. ++ If underlying persistent volume is being resized then ++ the Condition will be set to 'ResizeStarted'. + items: +- description: PersistentVolumeClaimCondition contails details about state of pvc ++ description: PersistentVolumeClaimCondition contails ++ details about state of pvc + properties: + lastProbeTime: + description: Last time we probed the condition. + format: date-time + type: string + lastTransitionTime: +- description: Last time the condition transitioned from one status to another. ++ description: Last time the condition transitioned ++ from one status to another. + format: date-time + type: string + message: +- description: Human-readable message indicating details about last transition. ++ description: Human-readable message indicating details ++ about last transition. + type: string + reason: +- description: Unique, this should be a short, machine understandable string that gives the reason for condition's last transition. If it reports "ResizeStarted" that means the underlying persistent volume is being resized. ++ description: Unique, this should be a short, machine ++ understandable string that gives the reason for ++ condition's last transition. If it reports "ResizeStarted" ++ that means the underlying persistent volume is ++ being resized. + type: string + status: + type: string + type: +- description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type ++ description: PersistentVolumeClaimConditionType ++ is a valid value of PersistentVolumeClaimCondition.Type + type: string + required: + - status +@@ -2410,47 +3624,77 @@ + tolerations: + description: If specified, the pod's tolerations. + items: +- description: The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . ++ description: The pod this Toleration is attached to tolerates any ++ taint that matches the triple using the matching ++ operator . + properties: + effect: +- description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. ++ description: Effect indicates the taint effect to match. Empty ++ means match all taint effects. When specified, allowed values ++ are NoSchedule, PreferNoSchedule and NoExecute. + type: string + key: +- description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys. ++ description: Key is the taint key that the toleration applies ++ to. Empty means match all taint keys. If the key is empty, ++ operator must be Exists; this combination means to match all ++ values and all keys. + type: string + operator: +- description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category. ++ description: Operator represents a key's relationship to the ++ value. Valid operators are Exists and Equal. Defaults to Equal. ++ Exists is equivalent to wildcard for value, so that a pod ++ can tolerate all taints of a particular category. + type: string + tolerationSeconds: +- description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system. ++ description: TolerationSeconds represents the period of time ++ the toleration (which must be of effect NoExecute, otherwise ++ this field is ignored) tolerates the taint. By default, it ++ is not set, which means tolerate the taint forever (do not ++ evict). Zero and negative values will be treated as 0 (evict ++ immediately) by the system. + format: int64 + type: integer + value: +- description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string. ++ description: Value is the taint value the toleration matches ++ to. If the operator is Exists, the value should be empty, ++ otherwise just a regular string. + type: string + type: object + type: array + topologySpreadConstraints: + description: If specified, the pod's topology spread constraints. + items: +- description: TopologySpreadConstraint specifies how to spread matching pods among the given topology. ++ description: TopologySpreadConstraint specifies how to spread matching ++ pods among the given topology. + properties: + labelSelector: +- description: LabelSelector is used to find matching pods. Pods that match this label selector are counted to determine the number of pods in their corresponding topology domain. ++ description: LabelSelector is used to find matching pods. Pods ++ that match this label selector are counted to determine the ++ number of pods in their corresponding topology domain. + properties: + matchExpressions: +- description: matchExpressions is a list of label selector requirements. The requirements are ANDed. ++ description: matchExpressions is a list of label selector ++ requirements. The requirements are ANDed. + items: +- description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. ++ description: A label selector requirement is a selector ++ that contains values, a key, and an operator that relates ++ the key and values. + properties: + key: +- description: key is the label key that the selector applies to. ++ description: key is the label key that the selector ++ applies to. + type: string + operator: +- description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. ++ description: operator represents a key's relationship ++ to a set of values. Valid operators are In, NotIn, ++ Exists and DoesNotExist. + type: string + values: +- description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. ++ description: values is an array of string values. ++ If the operator is In or NotIn, the values array ++ must be non-empty. If the operator is Exists or ++ DoesNotExist, the values array must be empty. This ++ array is replaced during a strategic merge patch. + items: + type: string + type: array +@@ -2462,18 +3706,48 @@ + matchLabels: + additionalProperties: + type: string +- description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. ++ description: matchLabels is a map of {key,value} pairs. ++ A single {key,value} in the matchLabels map is equivalent ++ to an element of matchExpressions, whose key field is ++ "key", the operator is "In", and the values array contains ++ only "value". The requirements are ANDed. + type: object + type: object + maxSkew: +- description: 'MaxSkew describes the degree to which pods may be unevenly distributed. It''s the maximum permitted difference between the number of matching pods in any two topology domains of a given topology type. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 1/1/0: | zone1 | zone2 | zone3 | | P | P | | - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 1/1/1; scheduling it onto zone1(zone2) would make the ActualSkew(2-0) on zone1(zone2) violate MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled onto any zone. It''s a required field. Default value is 1 and 0 is not allowed.' ++ description: 'MaxSkew describes the degree to which pods may ++ be unevenly distributed. It''s the maximum permitted difference ++ between the number of matching pods in any two topology domains ++ of a given topology type. For example, in a 3-zone cluster, ++ MaxSkew is set to 1, and pods with the same labelSelector ++ spread as 1/1/0: | zone1 | zone2 | zone3 | | P | P | | ++ - if MaxSkew is 1, incoming pod can only be scheduled to zone3 ++ to become 1/1/1; scheduling it onto zone1(zone2) would make ++ the ActualSkew(2-0) on zone1(zone2) violate MaxSkew(1). - ++ if MaxSkew is 2, incoming pod can be scheduled onto any zone. ++ It''s a required field. Default value is 1 and 0 is not allowed.' + format: int32 + type: integer + topologyKey: +- description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each as a "bucket", and try to put balanced number of pods into each bucket. It's a required field. ++ description: TopologyKey is the key of node labels. Nodes that ++ have a label with this key and identical values are considered ++ to be in the same topology. We consider each ++ as a "bucket", and try to put balanced number of pods into ++ each bucket. It's a required field. + type: string + whenUnsatisfiable: +- description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it - ScheduleAnyway tells the scheduler to still schedule it It''s considered as "Unsatisfiable" if and only if placing incoming pod on any topology violates "MaxSkew". For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.' ++ description: 'WhenUnsatisfiable indicates how to deal with a ++ pod if it doesn''t satisfy the spread constraint. - DoNotSchedule ++ (default) tells the scheduler not to schedule it - ScheduleAnyway ++ tells the scheduler to still schedule it It''s considered ++ as "Unsatisfiable" if and only if placing incoming pod on ++ any topology violates "MaxSkew". For example, in a 3-zone ++ cluster, MaxSkew is set to 1, and pods with the same labelSelector ++ spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | ++ If WhenUnsatisfiable is set to DoNotSchedule, incoming pod ++ can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) ++ as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In ++ other words, the cluster can still be imbalanced, but scheduler ++ won''t make it *more* imbalanced. It''s a required field.' + type: string + required: + - maxSkew +@@ -2482,13 +3756,17 @@ + type: object + type: array + tracingConfig: +- description: TracingConfig configures tracing in Thanos. This is an experimental feature, it may change in any upcoming release in a breaking way. ++ description: TracingConfig configures tracing in Thanos. This is an ++ experimental feature, it may change in any upcoming release in a ++ breaking way. + properties: + key: +- description: The key of the secret to select from. Must be a valid secret key. ++ description: The key of the secret to select from. Must be a ++ valid secret key. + type: string + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined +@@ -2497,31 +3775,50 @@ + - key + type: object + volumes: +- description: Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. ++ description: Volumes allows configuration of additional volumes on ++ the output StatefulSet definition. Volumes specified will be appended ++ to other volumes that are generated as a result of StorageSpec objects. + items: +- description: Volume represents a named volume in a pod that may be accessed by any container in the pod. ++ description: Volume represents a named volume in a pod that may ++ be accessed by any container in the pod. + properties: + awsElasticBlockStore: +- description: 'AWSElasticBlockStore represents an AWS Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'AWSElasticBlockStore represents an AWS Disk resource ++ that is attached to a kubelet''s host machine and then exposed ++ to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + partition: +- description: 'The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).' ++ description: 'The partition in the volume that you want ++ to mount. If omitted, the default is to mount by volume ++ name. Examples: For volume /dev/sda1, you specify the ++ partition as "1". Similarly, the volume partition for ++ /dev/sda is "0" (or you can leave the property empty).' + format: int32 + type: integer + readOnly: +- description: 'Specify "true" to force and set the ReadOnly property in VolumeMounts to "true". If omitted, the default is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'Specify "true" to force and set the ReadOnly ++ property in VolumeMounts to "true". If omitted, the default ++ is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + type: boolean + volumeID: +- description: 'Unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' ++ description: 'Unique ID of the persistent disk resource ++ in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + type: string + 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. + properties: + cachingMode: + description: 'Host Caching mode: None, Read Only, Read Write.' +@@ -2533,26 +3830,35 @@ + description: The URI the data disk in the blob storage + type: string + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + kind: +- description: 'Expected values Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared' ++ description: 'Expected values Shared: multiple blob disks ++ per storage account Dedicated: single blob disk per storage ++ account Managed: azure managed data disk (only in managed ++ availability set). defaults to shared' + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + required: + - 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. + properties: + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretName: +- description: the name of secret that contains Azure Storage Account Name and Key ++ description: the name of secret that contains Azure Storage ++ Account Name and Key + type: string + shareName: + description: Share Name +@@ -2562,66 +3868,99 @@ + - 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 + properties: + monitors: +- description: 'Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Required: Monitors is a collection of Ceph ++ monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + items: + type: string + type: array + path: +- description: 'Optional: Used as the mounted root, rather than the full Ceph tree, default is /' ++ description: 'Optional: Used as the mounted root, rather ++ than the full Ceph tree, default is /' + type: string + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: boolean + secretFile: +- description: 'Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: SecretFile is the path to key ring ++ for User, default is /etc/ceph/user.secret More info: ++ https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: string + secretRef: +- description: 'Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: SecretRef is reference to the authentication ++ secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + user: +- description: 'Optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' ++ description: 'Optional: User is the rados user name, default ++ is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + type: string + required: + - monitors + type: object + cinder: +- description: 'Cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Cinder represents a cinder volume attached and ++ mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + properties: + fsType: +- description: 'Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Examples: ++ "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" ++ if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: string + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: boolean + secretRef: +- description: 'Optional: points to a secret object containing parameters used to connect to OpenStack.' ++ description: 'Optional: points to a secret object containing ++ parameters used to connect to OpenStack.' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + volumeID: +- description: 'volume id used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' ++ description: 'volume id used to identify the volume in cinder. ++ More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + type: string + required: + - volumeID + type: object + configMap: +- description: ConfigMap represents a configMap that should populate this volume ++ description: ConfigMap represents a configMap that should populate ++ this volume + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: +- description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair in the ++ Data field of the referenced ConfigMap will be projected ++ into the volume as a file whose name is the key and content ++ is the value. If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys will not be ++ present. If a key is specified which is not present in ++ the ConfigMap, the volume setup will error unless it is ++ marked optional. Paths must be relative and may not contain ++ the '..' path or start with '..'. + items: + description: Maps a string key to a path within a volume. + properties: +@@ -2629,11 +3968,19 @@ + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file to map ++ the key to. May not be an absolute path. May not ++ contain the path element '..'. May not start with ++ the string '..'. + type: string + required: + - key +@@ -2641,81 +3988,124 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its keys must be defined ++ description: Specify whether the ConfigMap or its keys must ++ be defined + type: boolean + type: object + csi: +- description: CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature). ++ description: CSI (Container Storage Interface) represents storage ++ that is handled by an external CSI driver (Alpha feature). + properties: + driver: +- description: Driver is the name of the CSI driver that handles this volume. Consult with your admin for the correct name as registered in the cluster. ++ description: Driver is the name of the CSI driver that handles ++ this volume. Consult with your admin for the correct name ++ as registered in the cluster. + type: string + fsType: +- description: Filesystem type to mount. Ex. "ext4", "xfs", "ntfs". If not provided, the empty value is passed to the associated CSI driver which will determine the default filesystem to apply. ++ description: Filesystem type to mount. Ex. "ext4", "xfs", ++ "ntfs". If not provided, the empty value is passed to ++ the associated CSI driver which will determine the default ++ filesystem to apply. + type: string + nodePublishSecretRef: +- description: NodePublishSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, and may be empty if no secret is required. If the secret object contains more than one secret, all secret references are passed. ++ description: NodePublishSecretRef is a reference to the ++ secret object containing sensitive information to pass ++ to the CSI driver to complete the CSI NodePublishVolume ++ and NodeUnpublishVolume calls. This field is optional, ++ and may be empty if no secret is required. If the secret ++ object contains more than one secret, all secret references ++ are passed. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + readOnly: +- description: Specifies a read-only configuration for the volume. Defaults to false (read/write). ++ description: Specifies a read-only configuration for the ++ volume. Defaults to false (read/write). + type: boolean + volumeAttributes: + additionalProperties: + type: string +- description: VolumeAttributes stores driver-specific properties that are passed to the CSI driver. Consult your driver's documentation for supported values. ++ description: VolumeAttributes stores driver-specific properties ++ that are passed to the CSI driver. Consult your driver's ++ documentation for supported values. + type: object + required: + - driver + type: object + downwardAPI: +- description: DownwardAPI represents downward API about the pod that should populate this volume ++ description: DownwardAPI represents downward API about the pod ++ that should populate this volume + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: + description: Items is a list of downward API volume file + items: +- description: DownwardAPIVolumeFile represents information to create the file containing the pod field ++ description: DownwardAPIVolumeFile represents information ++ to create the file containing the pod field + properties: + fieldRef: +- description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' ++ description: 'Required: Selects a field of the pod: ++ only annotations, labels, name and namespace are ++ supported.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the FieldPath ++ is written in terms of, defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select in the ++ specified API version. + type: string + required: + - fieldPath + type: object + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: 'Required: Path is the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..''' ++ description: 'Required: Path is the relative path ++ name of the file to be created. Must not be absolute ++ or contain the ''..'' path. Must be utf-8 encoded. ++ The first item of the relative path must not start ++ with ''..''' + type: string + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.' ++ description: 'Selects a resource of the container: ++ only resources limits and requests (limits.cpu, ++ limits.memory, requests.cpu and requests.memory) ++ are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required for volumes, ++ optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format of the ++ exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +@@ -2730,31 +4120,48 @@ + type: array + type: object + emptyDir: +- description: 'EmptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'EmptyDir represents a temporary directory that ++ shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + properties: + medium: +- description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' ++ description: 'What type of storage medium should back this ++ directory. The default is "" which means to use the node''s ++ default medium. Must be an empty string (default) or Memory. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + type: string + sizeLimit: + anyOf: + - type: integer + - type: string +- description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' ++ description: 'Total amount of local storage required for ++ this EmptyDir volume. The size limit is also applicable ++ for memory medium. The maximum usage on memory medium ++ EmptyDir would be the minimum value between the SizeLimit ++ specified here and the sum of memory limits of all containers ++ in a pod. The default is nil which means that the limit ++ is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + fc: +- description: FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. ++ description: FC represents a Fibre Channel resource that is ++ attached to a kubelet's host machine and then exposed to the ++ pod. + properties: + fsType: +- description: 'Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + lun: + description: 'Optional: FC target lun number' + format: int32 + type: integer + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts.' + type: boolean + targetWWNs: + description: 'Optional: FC target worldwide names (WWNs)' +@@ -2762,19 +4169,26 @@ + type: string + type: array + wwids: +- description: 'Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.' ++ description: 'Optional: FC volume world wide identifiers ++ (wwids) Either wwids or combination of targetWWNs and ++ lun must be set, but not both simultaneously.' + items: + type: string + type: array + type: object + flexVolume: +- description: FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. ++ description: FlexVolume represents a generic volume resource ++ that is provisioned/attached using an exec based plugin. + properties: + driver: +- description: Driver is the name of the driver to use for this volume. ++ description: Driver is the name of the driver to use for ++ this volume. + type: string + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". The default filesystem depends on FlexVolume ++ script. + type: string + options: + additionalProperties: +@@ -2782,52 +4196,85 @@ + description: 'Optional: Extra command options if any.' + type: object + readOnly: +- description: 'Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.' ++ description: 'Optional: Defaults to false (read/write). ++ ReadOnly here will force the ReadOnly setting in VolumeMounts.' + type: boolean + secretRef: +- description: 'Optional: SecretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.' ++ description: 'Optional: SecretRef is reference to the secret ++ object containing sensitive information to pass to the ++ plugin scripts. This may be empty if no secret object ++ is specified. If the secret object contains more than ++ one secret, all secrets are passed to the plugin scripts.' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + 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 + properties: + datasetName: +- description: Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated ++ description: Name of the dataset stored as metadata -> name ++ on the dataset for Flocker should be considered as deprecated + type: string + datasetUUID: +- description: UUID of the dataset. This is unique identifier of a Flocker dataset ++ description: UUID of the dataset. This is unique identifier ++ of a Flocker dataset + type: string + type: object + gcePersistentDisk: +- description: 'GCEPersistentDisk represents a GCE Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'GCEPersistentDisk represents a GCE Disk resource ++ that is attached to a kubelet''s host machine and then exposed ++ to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + partition: +- description: 'The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'The partition in the volume that you want ++ to mount. If omitted, the default is to mount by volume ++ name. Examples: For volume /dev/sda1, you specify the ++ partition as "1". Similarly, the volume partition for ++ /dev/sda is "0" (or you can leave the property empty). ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + format: int32 + type: integer + pdName: +- description: 'Unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'Unique name of the PD resource in GCE. Used ++ to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + type: string + readOnly: +- description: 'ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' ++ description: 'ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + type: boolean + required: + - pdName + 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 EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod''s container.' ++ description: 'GitRepo represents a git repository at a particular ++ revision. 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: +- description: Target directory name. Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name. ++ description: Target directory name. Must not contain or ++ start with '..'. If '.' is supplied, the volume directory ++ will be the git repository. Otherwise, if specified, ++ the volume will contain the git repository in the subdirectory ++ with the given name. + type: string + repository: + description: Repository URL +@@ -2839,35 +4286,51 @@ + - repository + type: object + glusterfs: +- description: 'Glusterfs represents a Glusterfs mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' ++ description: 'Glusterfs represents a Glusterfs mount on the ++ host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' + properties: + endpoints: +- description: 'EndpointsName is the endpoint name that details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'EndpointsName is the endpoint name that details ++ Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: string + path: +- description: 'Path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'Path is the Glusterfs volume path. More info: ++ https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: string + readOnly: +- description: 'ReadOnly here will force the Glusterfs volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' ++ description: 'ReadOnly here will force the Glusterfs volume ++ to be mounted with read-only permissions. Defaults to ++ false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + type: boolean + required: + - endpoints + - path + type: object + hostPath: +- description: 'HostPath represents a pre-existing file or directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the host machine. Most containers will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath --- TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not mount host directories as read/write.' ++ description: 'HostPath represents a pre-existing file or directory ++ on the host machine that is directly exposed to the container. ++ This is generally used for system agents or other privileged ++ things that are allowed to see the host machine. Most containers ++ will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath ++ --- TODO(jonesdl) We need to restrict who can use host directory ++ mounts and who can/can not mount host directories as read/write.' + properties: + path: +- description: 'Path of the directory on the host. If the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' ++ description: 'Path of the directory on the host. If the ++ path is a symlink, it will follow the link to the real ++ path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + type: +- description: 'Type for HostPath Volume Defaults to "" More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' ++ description: 'Type for HostPath Volume Defaults to "" More ++ info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + required: + - path + type: object + iscsi: +- description: 'ISCSI represents an ISCSI Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' ++ description: 'ISCSI represents an ISCSI Disk resource that is ++ attached to a kubelet''s host machine and then exposed to ++ the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' + properties: + chapAuthDiscovery: + description: whether support iSCSI Discovery CHAP authentication +@@ -2876,38 +4339,55 @@ + description: whether support iSCSI Session CHAP authentication + type: boolean + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + initiatorName: +- description: Custom iSCSI Initiator Name. If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface : will be created for the connection. ++ description: Custom iSCSI Initiator Name. If initiatorName ++ is specified with iscsiInterface simultaneously, new iSCSI ++ interface : will be created ++ for the connection. + type: string + iqn: + description: Target iSCSI Qualified Name. + type: string + iscsiInterface: +- description: iSCSI Interface Name that uses an iSCSI transport. Defaults to 'default' (tcp). ++ description: iSCSI Interface Name that uses an iSCSI transport. ++ Defaults to 'default' (tcp). + type: string + lun: + description: iSCSI Target Lun number. + format: int32 + type: integer + portals: +- description: iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260). ++ description: iSCSI Target Portal List. The portal is either ++ an IP or ip_addr:port if the port is other than default ++ (typically TCP ports 860 and 3260). + items: + type: string + type: array + readOnly: +- description: ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. ++ description: ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. + type: boolean + secretRef: +- description: CHAP Secret for iSCSI target and initiator authentication ++ description: CHAP Secret for iSCSI target and initiator ++ authentication + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + targetPortal: +- description: iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260). ++ description: iSCSI Target Portal. The Portal is either an ++ IP or ip_addr:port if the port is other than default (typically ++ TCP ports 860 and 3260). + type: string + required: + - iqn +@@ -2915,56 +4395,76 @@ + - targetPortal + type: object + name: +- description: 'Volume''s name. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' ++ description: 'Volume''s name. Must be a DNS_LABEL and unique ++ within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + nfs: +- description: 'NFS represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'NFS represents an NFS mount on the host that shares ++ a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + properties: + path: +- description: 'Path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'Path that is exported by the NFS server. More ++ info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: string + readOnly: +- description: 'ReadOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'ReadOnly here will force the NFS export to ++ be mounted with read-only permissions. Defaults to false. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: boolean + server: +- description: 'Server is the hostname or IP address of the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' ++ description: 'Server is the hostname or IP address of the ++ NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' + type: string + required: + - path + - server + type: object + persistentVolumeClaim: +- description: 'PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'PersistentVolumeClaimVolumeSource represents a ++ reference to a PersistentVolumeClaim in the same namespace. ++ More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + properties: + claimName: +- description: 'ClaimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' ++ description: 'ClaimName is the name of a PersistentVolumeClaim ++ in the same namespace as the pod using this volume. More ++ info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' + type: string + readOnly: +- description: Will force the ReadOnly setting in VolumeMounts. Default false. ++ description: Will force the ReadOnly setting in VolumeMounts. ++ Default false. + type: boolean + 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 + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + pdID: +- description: ID that identifies Photon Controller persistent disk ++ description: ID that identifies Photon Controller persistent ++ disk + type: string + 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 + properties: + fsType: +- description: FSType represents the filesystem type to mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified. ++ description: FSType represents the filesystem type to mount ++ Must be a filesystem type supported by the host operating ++ system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" ++ if unspecified. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + volumeID: + description: VolumeID uniquely identifies a Portworx volume +@@ -2973,34 +4473,62 @@ + - volumeID + type: object + projected: +- description: Items for all in one resources secrets, configmaps, and downward API ++ description: Items for all in one resources secrets, configmaps, ++ and downward API + properties: + defaultMode: +- description: Mode bits to use on created files by default. Must be a value between 0 and 0777. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set. ++ description: Mode bits to use on created files by default. ++ Must be a value between 0 and 0777. Directories within ++ the path are not affected by this setting. This might ++ be in conflict with other options that affect the file ++ mode, like fsGroup, and the result can be other mode bits ++ set. + format: int32 + type: integer + sources: + description: list of volume projections + items: +- description: Projection that may be projected along with other supported volume types ++ description: Projection that may be projected along with ++ other supported volume types + properties: + configMap: +- description: information about the configMap data to project ++ description: information about the configMap data ++ to project + properties: + items: +- description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair ++ in the Data field of the referenced ConfigMap ++ will be projected into the volume as a file ++ whose name is the key and content is the value. ++ If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys ++ will not be present. If a key is specified which ++ is not present in the ConfigMap, the volume ++ setup will error unless it is marked optional. ++ Paths must be relative and may not contain the ++ '..' path or start with '..'. + items: +- description: Maps a string key to a path within a volume. ++ description: Maps a string key to a path within ++ a volume. + properties: + key: + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file ++ to map the key to. May not be an absolute ++ path. May not contain the path element ++ '..'. May not start with the string '..'. + type: string + required: + - key +@@ -3008,54 +4536,85 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the ConfigMap or its keys must be defined ++ description: Specify whether the ConfigMap or ++ its keys must be defined + type: boolean + type: object + downwardAPI: +- description: information about the downwardAPI data to project ++ description: information about the downwardAPI data ++ to project + properties: + items: +- description: Items is a list of DownwardAPIVolume file ++ description: Items is a list of DownwardAPIVolume ++ file + items: +- description: DownwardAPIVolumeFile represents information to create the file containing the pod field ++ description: DownwardAPIVolumeFile represents ++ information to create the file containing ++ the pod field + properties: + fieldRef: +- description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' ++ description: 'Required: Selects a field ++ of the pod: only annotations, labels, ++ name and namespace are supported.' + properties: + apiVersion: +- description: Version of the schema the FieldPath is written in terms of, defaults to "v1". ++ description: Version of the schema the ++ FieldPath is written in terms of, ++ defaults to "v1". + type: string + fieldPath: +- description: Path of the field to select in the specified API version. ++ description: Path of the field to select ++ in the specified API version. + type: string + required: + - fieldPath + type: object + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: 'Required: Path is the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..''' ++ description: 'Required: Path is the relative ++ path name of the file to be created. Must ++ not be absolute or contain the ''..'' ++ path. Must be utf-8 encoded. The first ++ item of the relative path must not start ++ with ''..''' + type: string + resourceFieldRef: +- description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.' ++ description: 'Selects a resource of the ++ container: only resources limits and requests ++ (limits.cpu, limits.memory, requests.cpu ++ and requests.memory) are currently supported.' + properties: + containerName: +- description: 'Container name: required for volumes, optional for env vars' ++ description: 'Container name: required ++ for volumes, optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string +- description: Specifies the output format of the exposed resources, defaults to "1" ++ description: Specifies the output format ++ of the exposed resources, defaults ++ to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: +- description: 'Required: resource to select' ++ description: 'Required: resource to ++ select' + type: string + required: + - resource +@@ -3066,22 +4625,43 @@ + type: array + type: object + secret: +- description: information about the secret data to project ++ description: information about the secret data to ++ project + properties: + items: +- description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair ++ in the Data field of the referenced Secret will ++ be projected into the volume as a file whose ++ name is the key and content is the value. If ++ specified, the listed keys will be projected ++ into the specified paths, and unlisted keys ++ will not be present. If a key is specified which ++ is not present in the Secret, the volume setup ++ will error unless it is marked optional. Paths ++ must be relative and may not contain the '..' ++ path or start with '..'. + items: +- description: Maps a string key to a path within a volume. ++ description: Maps a string key to a path within ++ a volume. + properties: + key: + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use ++ on this file, must be a value between ++ 0 and 0777. If not specified, the volume ++ defaultMode will be used. This might be ++ in conflict with other options that affect ++ the file mode, like fsGroup, and the result ++ can be other mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file ++ to map the key to. May not be an absolute ++ path. May not contain the path element ++ '..'. May not start with the string '..'. + type: string + required: + - key +@@ -3089,24 +4669,44 @@ + type: object + type: array + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: ++ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, ++ uid?' + type: string + optional: +- description: Specify whether the Secret or its key must be defined ++ description: Specify whether the Secret or its ++ key must be defined + type: boolean + type: object + serviceAccountToken: +- description: information about the serviceAccountToken data to project ++ description: information about the serviceAccountToken ++ data to project + properties: + audience: +- description: Audience is the intended audience of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise should reject the token. The audience defaults to the identifier of the apiserver. ++ description: Audience is the intended audience ++ of the token. A recipient of a token must identify ++ itself with an identifier specified in the audience ++ of the token, and otherwise should reject the ++ token. The audience defaults to the identifier ++ of the apiserver. + type: string + expirationSeconds: +- description: ExpirationSeconds is the requested duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively rotate the service account token. The kubelet will start trying to rotate the token if the token is older than 80 percent of its time to live or if the token is older than 24 hours.Defaults to 1 hour and must be at least 10 minutes. ++ description: ExpirationSeconds is the requested ++ duration of validity of the service account ++ token. As the token approaches expiration, the ++ kubelet volume plugin will proactively rotate ++ the service account token. The kubelet will ++ start trying to rotate the token if the token ++ is older than 80 percent of its time to live ++ or if the token is older than 24 hours.Defaults ++ to 1 hour and must be at least 10 minutes. + format: int64 + type: integer + path: +- description: Path is the path relative to the mount point of the file to project the token into. ++ description: Path is the path relative to the ++ mount point of the file to project the token ++ into. + type: string + required: + - path +@@ -3117,103 +4717,143 @@ + - sources + 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 + properties: + group: +- description: Group to map volume access to Default is no group ++ description: Group to map volume access to Default is no ++ group + type: string + readOnly: +- description: ReadOnly here will force the Quobyte volume to be mounted with read-only permissions. Defaults to false. ++ description: ReadOnly here will force the Quobyte volume ++ to be mounted with read-only permissions. Defaults to ++ false. + type: boolean + registry: +- description: Registry represents a single or multiple Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes ++ description: Registry represents a single or multiple Quobyte ++ Registry services specified as a string as host:port pair ++ (multiple entries are separated with commas) which acts ++ as the central registry for volumes + type: string + tenant: +- description: Tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin ++ description: Tenant owning the given Quobyte volume in the ++ Backend Used with dynamically provisioned Quobyte volumes, ++ value is set by the plugin + type: string + user: +- description: User to map volume access to Defaults to serivceaccount user ++ description: User to map volume access to Defaults to serivceaccount ++ user + type: string + volume: +- description: Volume is a string that references an already created Quobyte volume by name. ++ description: Volume is a string that references an already ++ created Quobyte volume by name. + type: string + required: + - registry + - volume + type: object + rbd: +- description: 'RBD represents a Rados Block Device mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' ++ description: 'RBD represents a Rados Block Device mount on the ++ host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' + properties: + fsType: +- description: 'Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from compromising the machine' ++ description: 'Filesystem type of the volume that you want ++ to mount. Tip: Ensure that the filesystem type is supported ++ by the host operating system. Examples: "ext4", "xfs", ++ "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd ++ TODO: how do we prevent errors in the filesystem from ++ compromising the machine' + type: string + image: + description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + keyring: +- description: 'Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'Keyring is the path to key ring for RBDUser. ++ Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + monitors: +- description: 'A collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'A collection of Ceph monitors. More info: ++ https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + items: + type: string + type: array + pool: +- description: 'The rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'The rados pool name. Default is rbd. More ++ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + readOnly: +- description: 'ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'ReadOnly here will force the ReadOnly setting ++ in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: boolean + secretRef: +- description: 'SecretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'SecretRef is name of the authentication secret ++ for RBDUser. If provided overrides keyring. Default is ++ nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + user: +- description: 'The rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ++ description: 'The rados user name. Default is admin. More ++ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + required: + - 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. + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Default is "xfs". ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Default is "xfs". + type: string + gateway: + description: The host address of the ScaleIO API Gateway. + type: string + protectionDomain: +- description: The name of the ScaleIO Protection Domain for the configured storage. ++ description: The name of the ScaleIO Protection Domain for ++ the configured storage. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretRef: +- description: SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail. ++ description: SecretRef references to the secret for ScaleIO ++ user and other sensitive information. If this is not provided, ++ Login operation will fail. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + sslEnabled: +- description: Flag to enable/disable SSL communication with Gateway, default false ++ description: Flag to enable/disable SSL communication with ++ Gateway, default false + type: boolean + storageMode: +- description: Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned. ++ description: Indicates whether the storage for a volume ++ should be ThickProvisioned or ThinProvisioned. Default ++ is ThinProvisioned. + type: string + storagePool: +- description: The ScaleIO Storage Pool associated with the protection domain. ++ description: The ScaleIO Storage Pool associated with the ++ protection domain. + type: string + system: +- description: The name of the storage system as configured in ScaleIO. ++ description: The name of the storage system as configured ++ in ScaleIO. + type: string + volumeName: +- description: The name of a volume already created in the ScaleIO system that is associated with this volume source. ++ description: The name of a volume already created in the ++ ScaleIO system that is associated with this volume source. + type: string + required: + - gateway +@@ -3221,14 +4861,28 @@ + - system + type: object + secret: +- description: 'Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' ++ description: 'Secret represents a secret that should populate ++ this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + properties: + defaultMode: +- description: 'Optional: mode bits to use on created files by default. Must be a value between 0 and 0777. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on created files ++ by default. Must be a value between 0 and 0777. Defaults ++ to 0644. Directories within the path are not affected ++ by this setting. This might be in conflict with other ++ options that affect the file mode, like fsGroup, and the ++ result can be other mode bits set.' + format: int32 + type: integer + items: +- description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. ++ description: If unspecified, each key-value pair in the ++ Data field of the referenced Secret will be projected ++ into the volume as a file whose name is the key and content ++ is the value. If specified, the listed keys will be projected ++ into the specified paths, and unlisted keys will not be ++ present. If a key is specified which is not present in ++ the Secret, the volume setup will error unless it is marked ++ optional. Paths must be relative and may not contain the ++ '..' path or start with '..'. + items: + description: Maps a string key to a path within a volume. + properties: +@@ -3236,11 +4890,19 @@ + description: The key to project. + type: string + mode: +- description: 'Optional: mode bits to use on this file, must be a value between 0 and 0777. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.' ++ description: 'Optional: mode bits to use on this file, ++ must be a value between 0 and 0777. If not specified, ++ the volume defaultMode will be used. This might ++ be in conflict with other options that affect the ++ file mode, like fsGroup, and the result can be other ++ mode bits set.' + format: int32 + type: integer + path: +- description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. ++ description: The relative path of the file to map ++ the key to. May not be an absolute path. May not ++ contain the path element '..'. May not start with ++ the string '..'. + type: string + required: + - key +@@ -3248,46 +4910,69 @@ + type: object + type: array + optional: +- description: Specify whether the Secret or its keys must be defined ++ description: Specify whether the Secret or its keys must ++ be defined + type: boolean + secretName: +- description: 'Name of the secret in the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' ++ description: 'Name of the secret in the pod''s namespace ++ to use. 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. + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + readOnly: +- description: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ++ description: Defaults to false (read/write). ReadOnly here ++ will force the ReadOnly setting in VolumeMounts. + type: boolean + secretRef: +- description: SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted. ++ description: SecretRef specifies the secret to use for obtaining ++ the StorageOS API credentials. If not specified, default ++ values will be attempted. + properties: + name: +- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' ++ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names ++ TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + volumeName: +- description: VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace. ++ description: VolumeName is the human-readable name of the ++ StorageOS volume. Volume names are only unique within ++ a namespace. + type: string + volumeNamespace: +- description: VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to "default" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created. ++ description: VolumeNamespace specifies the scope of the ++ volume within StorageOS. If no namespace is specified ++ then the Pod's namespace will be used. This allows the ++ Kubernetes name scoping to be mirrored within StorageOS ++ for tighter integration. Set VolumeName to any name to ++ override the default behaviour. Set to "default" if you ++ are not using namespaces within StorageOS. 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 + properties: + fsType: +- description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. ++ description: Filesystem type to mount. Must be a filesystem ++ type supported by the host operating system. Ex. "ext4", ++ "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + type: string + storagePolicyID: +- description: Storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName. ++ description: Storage Policy Based Management (SPBM) profile ++ ID associated with the StoragePolicyName. + type: string + storagePolicyName: +- description: Storage Policy Based Management (SPBM) profile name. ++ description: Storage Policy Based Management (SPBM) profile ++ name. + type: string + volumePath: + description: Path that identifies vSphere volume vmdk +@@ -3301,25 +4986,32 @@ + type: array + type: object + status: +- description: 'Most recent observed status of the ThanosRuler cluster. Read-only. Not included when requesting from the apiserver, only from the ThanosRuler Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' ++ description: 'Most recent observed status of the ThanosRuler cluster. ++ Read-only. Not included when requesting from the apiserver, only from ++ the ThanosRuler Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status' + properties: + availableReplicas: +- description: Total number of available pods (ready for at least minReadySeconds) targeted by this ThanosRuler deployment. ++ description: Total number of available pods (ready for at least minReadySeconds) ++ targeted by this ThanosRuler deployment. + format: int32 + type: integer + paused: +- description: Represents whether any actions on the underlying managed objects are being performed. Only delete actions will be performed. ++ description: Represents whether any actions on the underlying managed ++ objects are being performed. Only delete actions will be performed. + type: boolean + replicas: +- description: Total number of non-terminated pods targeted by this ThanosRuler deployment (their labels match the selector). ++ description: Total number of non-terminated pods targeted by this ++ ThanosRuler deployment (their labels match the selector). + format: int32 + type: integer + unavailableReplicas: +- description: Total number of unavailable pods targeted by this ThanosRuler deployment. ++ description: Total number of unavailable pods targeted by this ThanosRuler ++ deployment. + format: int32 + type: integer + updatedReplicas: +- description: Total number of non-terminated pods targeted by this ThanosRuler deployment that have the desired version spec. ++ description: Total number of non-terminated pods targeted by this ++ ThanosRuler deployment that have the desired version spec. + format: int32 + type: integer + required: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch index 3629a5519..75701802b 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch @@ -140,3 +140,17 @@ app.kubernetes.io/part-of: {{ template "kube-prometheus-stack.name" . }} chart: {{ template "kube-prometheus-stack.chartref" . }} release: {{ $.Release.Name | quote }} +@@ -98,7 +225,12 @@ + + {{/* Allow KubeVersion to be overridden. */}} + {{- define "kube-prometheus-stack.ingress.kubeVersion" -}} +- {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}} ++ {{- $kubeVersion := default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}} ++ {{/* Special use case for Amazon EKS, Google GKE */}} ++ {{- if and (regexMatch "\\d+\\.\\d+\\.\\d+-(?:eks|gke).+" $kubeVersion) (not .Values.kubeVersionOverride) -}} ++ {{- $kubeVersion = regexFind "\\d+\\.\\d+\\.\\d+" $kubeVersion -}} ++ {{- end -}} ++ {{- $kubeVersion -}} + {{- end -}} + + {{/* Get Ingress API Version */}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch new file mode 100644 index 000000000..8002006e2 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch @@ -0,0 +1,36 @@ +--- charts-original/templates/exporters/kube-state-metrics/serviceMonitor.yaml ++++ charts/templates/exporters/kube-state-metrics/serviceMonitor.yaml +@@ -10,7 +10,7 @@ + spec: + jobLabel: app.kubernetes.io/name + endpoints: +- - port: http ++ - port: metrics + {{- if .Values.kubeStateMetrics.serviceMonitor.interval }} + interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }} + {{- end }} +@@ -26,6 +26,24 @@ + relabelings: + {{ toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4 }} + {{- end }} ++{{- if .Values.kubeStateMetrics.serviceMonitor.selfMonitor.enabled }} ++ - port: metrics ++ {{- if .Values.kubeStateMetrics.serviceMonitor.interval }} ++ interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }} ++ {{- end }} ++ {{- if .Values.kubeStateMetrics.serviceMonitor.proxyUrl }} ++ proxyUrl: {{ .Values.kubeStateMetrics.serviceMonitor.proxyUrl}} ++ {{- end }} ++ honorLabels: true ++{{- if .Values.kubeStateMetrics.serviceMonitor.metricRelabelings }} ++ metricRelabelings: ++{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.metricRelabelings | indent 4) . }} ++{{- end }} ++{{- if .Values.kubeStateMetrics.serviceMonitor.relabelings }} ++ relabelings: ++{{ toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4 }} ++{{- end }} ++{{- end }} + {{- if .Values.kubeStateMetrics.serviceMonitor.namespaceOverride }} + namespaceSelector: + matchNames: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch index 29cd80d07..a9042aa4c 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch @@ -33,3 +33,11 @@ {{- if .Values.kubelet.serviceMonitor.interval }} interval: {{ .Values.kubelet.serviceMonitor.interval }} {{- end }} +@@ -168,6 +171,6 @@ + - {{ .Values.kubelet.namespace }} + selector: + matchLabels: +- app.kubernetes.io/managed-by: prometheus-operator ++ app.kubernetes.io/name: kubelet + k8s-app: kubelet + {{- end}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch index 6a2e763ec..bcb9dddcf 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/apiserver.yaml +++ charts/templates/grafana/dashboards-1.14/apiserver.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'apiserver' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'apiserver' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch index 6355241d7..59d78a1f2 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/cluster-total.yaml +++ charts/templates/grafana/dashboards-1.14/cluster-total.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'cluster-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'cluster-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch index cf6f2788a..4aa543a35 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/grafana/dashboards-1.14/controller-manager.yaml +++ charts/templates/grafana/dashboards-1.14/controller-manager.yaml -@@ -4,11 +4,12 @@ +@@ -1,14 +1,15 @@ + {{- /* +-Generated from 'controller-manager' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'controller-manager' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} @@ -28,33 +32,45 @@ "format": "time_series", "intervalFactor": 2, "legendFormat": "", -@@ -176,7 +181,7 @@ +@@ -176,10 +181,10 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(workqueue_adds_total{cluster=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[5m])) by (instance, name)", -+ "expr": "sum(rate(workqueue_adds_total{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance, name)", ++ "expr": "sum(rate(workqueue_adds_total{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance, name)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", -@@ -282,7 +287,7 @@ +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", + "refId": "A" + } + ], +@@ -282,10 +287,10 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(workqueue_depth{cluster=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[5m])) by (instance, name)", -+ "expr": "sum(rate(workqueue_depth{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance, name)", ++ "expr": "sum(rate(workqueue_depth{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance, name)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", -@@ -388,7 +393,7 @@ +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", + "refId": "A" + } + ], +@@ -388,10 +393,10 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[5m])) by (instance, name, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance, name, le))", ++ "expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance, name, le))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}", + "refId": "A" + } + ], @@ -494,28 +499,28 @@ "steppedLine": false, "targets": [ diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch index d5119291a..f43b5a0e1 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ charts/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,138 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -247,7 +247,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"cpu\"}) / sum(kube_node_status_allocatable{resource=\"cpu\",cluster=\"$cluster\"})", ++ "expr": "sum(namespace_cpu:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable{resource=\"cpu\",cluster=\"$cluster\"})", + "format": "time_series", + "instant": true, + "intervalFactor": 2, +@@ -499,7 +499,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"memory\"}) / sum(kube_node_status_allocatable{resource=\"memory\",cluster=\"$cluster\"})", ++ "expr": "sum(namespace_memory:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable{resource=\"memory\",cluster=\"$cluster\"})", + "format": "time_series", + "instant": true, + "intervalFactor": 2, +@@ -594,7 +594,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\"}) by (namespace)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}namespace{{`}}`}}", +@@ -885,7 +885,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\"}) by (namespace)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -903,7 +903,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace) / sum(namespace_cpu:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -912,7 +912,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)", ++ "expr": "sum(namespace_cpu:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -921,7 +921,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace) / sum(namespace_cpu:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1321,7 +1321,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", ++ "expr": "sum(namespace_memory:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1330,7 +1330,7 @@ + "step": 10 + }, + { +- "expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", ++ "expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(namespace_memory:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1339,7 +1339,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", ++ "expr": "sum(namespace_memory:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1348,7 +1348,7 @@ + "step": 10 + }, + { +- "expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", ++ "expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(namespace_memory:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -2149,7 +2149,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -2235,7 +2235,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -2333,7 +2333,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -2419,7 +2419,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch index 3ce475b39..222a5d75f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ charts/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,147 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -78,7 +78,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"})", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"})", + "format": "time_series", + "instant": true, + "intervalFactor": 2, +@@ -162,7 +162,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"})", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"})", + "format": "time_series", + "instant": true, + "intervalFactor": 2, +@@ -446,7 +446,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}pod{{`}}`}}", +@@ -697,7 +697,7 @@ + ], + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -706,7 +706,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -715,7 +715,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -724,7 +724,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -733,7 +733,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1171,7 +1171,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1180,7 +1180,7 @@ + "step": 10 + }, + { +- "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1189,7 +1189,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1198,7 +1198,7 @@ + "step": 10 + }, + { +- "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1842,7 +1842,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1928,7 +1928,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -2026,7 +2026,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -2112,7 +2112,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch index 262ac9081..066e0cddc 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +++ charts/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,93 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -77,7 +77,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}pod{{`}}`}}", +@@ -312,7 +312,7 @@ + ], + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -321,7 +321,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -330,7 +330,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -339,7 +339,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -348,7 +348,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -749,7 +749,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -758,7 +758,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -767,7 +767,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -776,7 +776,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)", ++ "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\"}) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch index 68241b00b..091b14f63 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ charts/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,129 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -94,7 +94,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{namespace=\"$namespace\", pod=\"$pod\", cluster=\"$cluster\"}) by (container)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace=\"$namespace\", pod=\"$pod\", cluster=\"$cluster\"}) by (container)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}container{{`}}`}}", +@@ -450,7 +450,7 @@ + ], + "targets": [ + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -459,7 +459,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\"}) by (container)", ++ "expr": "sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -468,7 +468,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\"}) by (container)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -477,7 +477,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\"}) by (container)", ++ "expr": "sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -486,7 +486,7 @@ + "step": 10 + }, + { +- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\"}) by (container)", ++ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -922,7 +922,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\"}) by (container)", ++ "expr": "sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -931,7 +931,7 @@ + "step": 10 + }, + { +- "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}) by (container) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\"}) by (container)", ++ "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}) by (container) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -940,7 +940,7 @@ + "step": 10 + }, + { +- "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\"}) by (container)", ++ "expr": "sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -949,7 +949,7 @@ + "step": 10 + }, + { +- "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", container!=\"\", image!=\"\"}) by (container) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\"}) by (container)", ++ "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\", container!=\"\", image!=\"\"}) by (container) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", pod=\"$pod\"}) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1294,7 +1294,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1381,7 +1381,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1480,7 +1480,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1567,7 +1567,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch index 5d91141fc..9d378015e 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ charts/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,75 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -77,7 +77,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}pod{{`}}`}}", +@@ -312,7 +312,7 @@ + ], + "targets": [ + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -330,7 +330,7 @@ + "step": 10 + }, + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -348,7 +348,7 @@ + "step": 10 + }, + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n/sum(\n kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n * on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\", workload_type=\"$type\"}\n) by (pod)\n", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1520,7 +1520,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1606,7 +1606,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1704,7 +1704,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1790,7 +1790,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch index 2f7abde96..07f968e9a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ charts/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,75 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -98,7 +98,7 @@ + "steppedLine": false, + "targets": [ + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{`{{`}}workload{{`}}`}} - {{`{{`}}workload_type{{`}}`}}", +@@ -396,7 +396,7 @@ + "step": 10 + }, + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -414,7 +414,7 @@ + "step": 10 + }, + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -432,7 +432,7 @@ + "step": 10 + }, + { +- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", ++ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\", resource=\"cpu\"}\n* on(namespace,pod)\n group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n", + "format": "table", + "instant": true, + "intervalFactor": 2, +@@ -1707,7 +1707,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1793,7 +1793,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1891,7 +1891,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, +@@ -1977,7 +1977,7 @@ + }, + "yaxes": [ + { +- "format": "Bps", ++ "format": "pps", + "label": null, + "logBase": 1, + "max": null, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch index c3331e5ac..fa0ff0494 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/grafana/dashboards-1.14/kubelet.yaml +++ charts/templates/grafana/dashboards-1.14/kubelet.yaml -@@ -4,11 +4,12 @@ +@@ -1,14 +1,15 @@ + {{- /* +-Generated from 'kubelet' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'kubelet' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} @@ -15,263 +19,4311 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} -@@ -107,7 +108,7 @@ - "tableColumn": "", - "targets": [ - { +@@ -40,2385 +41,2100 @@ + "links": [ + + ], +- "refresh": "10s", +- "rows": [ ++ "panels": [ + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "cacheTimeout": null, +- "colorBackground": false, +- "colorValue": false, +- "colors": [ +- "#299c46", +- "rgba(237, 129, 40, 0.89)", +- "#d44a3a" +- ], +- "datasource": "$datasource", +- "format": "none", +- "gauge": { +- "maxValue": 100, +- "minValue": 0, +- "show": false, +- "thresholdLabels": false, +- "thresholdMarkers": true +- }, +- "gridPos": { +- +- }, +- "id": 2, +- "interval": null, ++ "datasource": "$datasource", ++ "fieldConfig": { ++ "defaults": { + "links": [ + + ], +- "mappingType": 1, +- "mappingTypes": [ +- { +- "name": "value to text", +- "value": 1 +- }, +- { +- "name": "range to text", +- "value": 2 +- } +- ], +- "maxDataPoints": 100, +- "nullPointMode": "connected", +- "nullText": null, +- "postfix": "", +- "postfixFontSize": "50%", +- "prefix": "", +- "prefixFontSize": "50%", +- "rangeMaps": [ +- { +- "from": "null", +- "text": "N/A", +- "to": "null" +- } +- ], +- "span": 2, +- "sparkline": { +- "fillColor": "rgba(31, 118, 189, 0.18)", +- "full": false, +- "lineColor": "rgb(31, 120, 193)", +- "show": false +- }, +- "tableColumn": "", +- "targets": [ +- { - "expr": "sum(kubelet_node_name{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\"})", -+ "expr": "sum(kubelet_node_name{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", -@@ -191,7 +192,7 @@ - "tableColumn": "", - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "", +- "refId": "A" +- } +- ], +- "thresholds": "", +- "title": "Running Kubelets", +- "tooltip": { +- "shared": false +- }, +- "type": "singlestat", +- "valueFontSize": "80%", +- "valueMaps": [ +- { +- "op": "=", +- "text": "N/A", +- "value": "null" +- } +- ], +- "valueName": "min" +- }, +- { +- "cacheTimeout": null, +- "colorBackground": false, +- "colorValue": false, +- "colors": [ +- "#299c46", +- "rgba(237, 129, 40, 0.89)", +- "#d44a3a" +- ], +- "datasource": "$datasource", +- "format": "none", +- "gauge": { +- "maxValue": 100, +- "minValue": 0, +- "show": false, +- "thresholdLabels": false, +- "thresholdMarkers": true +- }, +- "gridPos": { ++ "mappings": [ + +- }, +- "id": 3, +- "interval": null, +- "links": [ +- +- ], +- "mappingType": 1, +- "mappingTypes": [ +- { +- "name": "value to text", +- "value": 1 +- }, +- { +- "name": "range to text", +- "value": 2 +- } +- ], +- "maxDataPoints": 100, +- "nullPointMode": "connected", +- "nullText": null, +- "postfix": "", +- "postfixFontSize": "50%", +- "prefix": "", +- "prefixFontSize": "50%", +- "rangeMaps": [ +- { +- "from": "null", +- "text": "N/A", +- "to": "null" +- } +- ], +- "span": 2, +- "sparkline": { +- "fillColor": "rgba(31, 118, 189, 0.18)", +- "full": false, +- "lineColor": "rgb(31, 120, 193)", +- "show": false +- }, +- "tableColumn": "", +- "targets": [ +- { - "expr": "sum(kubelet_running_pods{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_pod_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", -+ "expr": "sum(kubelet_running_pods{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_pod_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -275,7 +276,7 @@ - "tableColumn": "", - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": "", +- "title": "Running Pods", +- "tooltip": { +- "shared": false +- }, +- "type": "singlestat", +- "valueFontSize": "80%", +- "valueMaps": [ +- { +- "op": "=", +- "text": "N/A", +- "value": "null" +- } +- ], +- "valueName": "min" +- }, +- { +- "cacheTimeout": null, +- "colorBackground": false, +- "colorValue": false, +- "colors": [ +- "#299c46", +- "rgba(237, 129, 40, 0.89)", +- "#d44a3a" + ], +- "datasource": "$datasource", +- "format": "none", +- "gauge": { +- "maxValue": 100, +- "minValue": 0, +- "show": false, +- "thresholdLabels": false, +- "thresholdMarkers": true +- }, +- "gridPos": { ++ "thresholds": { ++ "mode": "absolute", ++ "steps": [ + ++ ] + }, +- "id": 4, +- "interval": null, +- "links": [ ++ "unit": "none" ++ } ++ }, ++ "gridPos": { ++ "h": 7, ++ "w": 4, ++ "x": 0, ++ "y": 0 ++ }, ++ "id": 2, ++ "links": [ + ++ ], ++ "options": { ++ "colorMode": "value", ++ "graphMode": "area", ++ "justifyMode": "auto", ++ "orientation": "auto", ++ "reduceOptions": { ++ "calcs": [ ++ "lastNotNull" + ], +- "mappingType": 1, +- "mappingTypes": [ +- { +- "name": "value to text", +- "value": 1 +- }, +- { +- "name": "range to text", +- "value": 2 +- } +- ], +- "maxDataPoints": 100, +- "nullPointMode": "connected", +- "nullText": null, +- "postfix": "", +- "postfixFontSize": "50%", +- "prefix": "", +- "prefixFontSize": "50%", +- "rangeMaps": [ +- { +- "from": "null", +- "text": "N/A", +- "to": "null" +- } +- ], +- "span": 2, +- "sparkline": { +- "fillColor": "rgba(31, 118, 189, 0.18)", +- "full": false, +- "lineColor": "rgb(31, 120, 193)", +- "show": false +- }, +- "tableColumn": "", +- "targets": [ +- { - "expr": "sum(kubelet_running_containers{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_container_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", -+ "expr": "sum(kubelet_running_containers{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_container_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -359,7 +360,7 @@ - "tableColumn": "", - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": "", +- "title": "Running Container", +- "tooltip": { +- "shared": false +- }, +- "type": "singlestat", +- "valueFontSize": "80%", +- "valueMaps": [ +- { +- "op": "=", +- "text": "N/A", +- "value": "null" +- } +- ], +- "valueName": "min" +- }, ++ "fields": "", ++ "values": false ++ } ++ }, ++ "pluginVersion": "7", ++ "targets": [ + { +- "cacheTimeout": null, +- "colorBackground": false, +- "colorValue": false, +- "colors": [ +- "#299c46", +- "rgba(237, 129, 40, 0.89)", +- "#d44a3a" +- ], +- "datasource": "$datasource", +- "format": "none", +- "gauge": { +- "maxValue": 100, +- "minValue": 0, +- "show": false, +- "thresholdLabels": false, +- "thresholdMarkers": true +- }, +- "gridPos": { +- +- }, +- "id": 5, +- "interval": null, ++ "expr": "sum(kubelet_node_name{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\"})", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "", ++ "refId": "A" ++ } ++ ], ++ "title": "Running Kubelets", ++ "transparent": false, ++ "type": "stat" ++ }, ++ { ++ "datasource": "$datasource", ++ "fieldConfig": { ++ "defaults": { + "links": [ + + ], +- "mappingType": 1, +- "mappingTypes": [ +- { +- "name": "value to text", +- "value": 1 +- }, +- { +- "name": "range to text", +- "value": 2 +- } +- ], +- "maxDataPoints": 100, +- "nullPointMode": "connected", +- "nullText": null, +- "postfix": "", +- "postfixFontSize": "50%", +- "prefix": "", +- "prefixFontSize": "50%", +- "rangeMaps": [ +- { +- "from": "null", +- "text": "N/A", +- "to": "null" +- } +- ], +- "span": 2, +- "sparkline": { +- "fillColor": "rgba(31, 118, 189, 0.18)", +- "full": false, +- "lineColor": "rgb(31, 120, 193)", +- "show": false +- }, +- "tableColumn": "", +- "targets": [ +- { - "expr": "sum(volume_manager_total_volumes{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\", state=\"actual_state_of_world\"})", -+ "expr": "sum(volume_manager_total_volumes{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\", state=\"actual_state_of_world\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -443,7 +444,7 @@ - "tableColumn": "", - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": "", +- "title": "Actual Volume Count", +- "tooltip": { +- "shared": false +- }, +- "type": "singlestat", +- "valueFontSize": "80%", +- "valueMaps": [ +- { +- "op": "=", +- "text": "N/A", +- "value": "null" +- } +- ], +- "valueName": "min" +- }, +- { +- "cacheTimeout": null, +- "colorBackground": false, +- "colorValue": false, +- "colors": [ +- "#299c46", +- "rgba(237, 129, 40, 0.89)", +- "#d44a3a" +- ], +- "datasource": "$datasource", +- "format": "none", +- "gauge": { +- "maxValue": 100, +- "minValue": 0, +- "show": false, +- "thresholdLabels": false, +- "thresholdMarkers": true +- }, +- "gridPos": { +- +- }, +- "id": 6, +- "interval": null, +- "links": [ ++ "mappings": [ + + ], +- "mappingType": 1, +- "mappingTypes": [ +- { +- "name": "value to text", +- "value": 1 +- }, +- { +- "name": "range to text", +- "value": 2 +- } +- ], +- "maxDataPoints": 100, +- "nullPointMode": "connected", +- "nullText": null, +- "postfix": "", +- "postfixFontSize": "50%", +- "prefix": "", +- "prefixFontSize": "50%", +- "rangeMaps": [ +- { +- "from": "null", +- "text": "N/A", +- "to": "null" +- } +- ], +- "span": 2, +- "sparkline": { +- "fillColor": "rgba(31, 118, 189, 0.18)", +- "full": false, +- "lineColor": "rgb(31, 120, 193)", +- "show": false +- }, +- "tableColumn": "", +- "targets": [ +- { - "expr": "sum(volume_manager_total_volumes{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",state=\"desired_state_of_world\"})", -+ "expr": "sum(volume_manager_total_volumes{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\",state=\"desired_state_of_world\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -527,7 +528,7 @@ - "tableColumn": "", - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": "", +- "title": "Desired Volume Count", +- "tooltip": { +- "shared": false +- }, +- "type": "singlestat", +- "valueFontSize": "80%", +- "valueMaps": [ +- { +- "op": "=", +- "text": "N/A", +- "value": "null" +- } +- ], +- "valueName": "min" +- }, +- { +- "cacheTimeout": null, +- "colorBackground": false, +- "colorValue": false, +- "colors": [ +- "#299c46", +- "rgba(237, 129, 40, 0.89)", +- "#d44a3a" +- ], +- "datasource": "$datasource", +- "format": "none", +- "gauge": { +- "maxValue": 100, +- "minValue": 0, +- "show": false, +- "thresholdLabels": false, +- "thresholdMarkers": true +- }, +- "gridPos": { ++ "thresholds": { ++ "mode": "absolute", ++ "steps": [ + ++ ] + }, +- "id": 7, +- "interval": null, +- "links": [ ++ "unit": "none" ++ } ++ }, ++ "gridPos": { ++ "h": 7, ++ "w": 4, ++ "x": 4, ++ "y": 0 ++ }, ++ "id": 3, ++ "links": [ + ++ ], ++ "options": { ++ "colorMode": "value", ++ "graphMode": "area", ++ "justifyMode": "auto", ++ "orientation": "auto", ++ "reduceOptions": { ++ "calcs": [ ++ "lastNotNull" + ], +- "mappingType": 1, +- "mappingTypes": [ +- { +- "name": "value to text", +- "value": 1 +- }, +- { +- "name": "range to text", +- "value": 2 +- } +- ], +- "maxDataPoints": 100, +- "nullPointMode": "connected", +- "nullText": null, +- "postfix": "", +- "postfixFontSize": "50%", +- "prefix": "", +- "prefixFontSize": "50%", +- "rangeMaps": [ +- { +- "from": "null", +- "text": "N/A", +- "to": "null" +- } +- ], +- "span": 2, +- "sparkline": { +- "fillColor": "rgba(31, 118, 189, 0.18)", +- "full": false, +- "lineColor": "rgb(31, 120, 193)", +- "show": false +- }, +- "tableColumn": "", +- "targets": [ +- { - "expr": "sum(rate(kubelet_node_config_error{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m]))", -+ "expr": "sum(rate(kubelet_node_config_error{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -609,7 +610,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": "", +- "title": "Config Error Count", +- "tooltip": { +- "shared": false +- }, +- "type": "singlestat", +- "valueFontSize": "80%", +- "valueMaps": [ +- { +- "op": "=", +- "text": "N/A", +- "value": "null" +- } +- ], +- "valueName": "min" ++ "fields": "", ++ "values": false ++ } ++ }, ++ "pluginVersion": "7", ++ "targets": [ ++ { ++ "expr": "sum(kubelet_running_pods{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_pod_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" + } + ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "title": "Running Pods", ++ "transparent": false, ++ "type": "stat" + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 8, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, ++ "datasource": "$datasource", ++ "fieldConfig": { ++ "defaults": { + "links": [ + + ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ +- +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(kubelet_runtime_operations_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (operation_type, instance)", -+ "expr": "sum(rate(kubelet_runtime_operations_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (operation_type, instance)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", -@@ -702,7 +703,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ "mappings": [ + + ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Operation Rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ "thresholds": { ++ "mode": "absolute", ++ "steps": [ + + ] + }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- } +- ] +- }, +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 9, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ +- +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ +- +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(kubelet_runtime_operations_errors_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_type)", -+ "expr": "sum(rate(kubelet_runtime_operations_errors_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_type)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", -@@ -808,7 +809,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ "unit": "none" ++ } ++ }, ++ "gridPos": { ++ "h": 7, ++ "w": 4, ++ "x": 8, ++ "y": 0 ++ }, ++ "id": 4, ++ "links": [ + ++ ], ++ "options": { ++ "colorMode": "value", ++ "graphMode": "area", ++ "justifyMode": "auto", ++ "orientation": "auto", ++ "reduceOptions": { ++ "calcs": [ ++ "lastNotNull" + ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Operation Error Rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ +- +- ] +- }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ "fields": "", ++ "values": false ++ } ++ }, ++ "pluginVersion": "7", ++ "targets": [ ++ { ++ "expr": "sum(kubelet_running_containers{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_container_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" + } + ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "title": "Running Container", ++ "transparent": false, ++ "type": "stat" + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 10, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, ++ "datasource": "$datasource", ++ "fieldConfig": { ++ "defaults": { + "links": [ + + ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ "mappings": [ + + ], +- "spaceLength": 10, +- "span": 12, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(kubelet_runtime_operations_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_type, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_runtime_operations_duration_seconds_bucket{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_type, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", -@@ -914,14 +915,14 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ +- +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Operation duration 99th quantile", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ "thresholds": { ++ "mode": "absolute", ++ "steps": [ + + ] + }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- } +- ] ++ "unit": "none" + } ++ }, ++ "gridPos": { ++ "h": 7, ++ "w": 4, ++ "x": 12, ++ "y": 0 ++ }, ++ "id": 5, ++ "links": [ ++ + ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "options": { ++ "colorMode": "value", ++ "graphMode": "area", ++ "justifyMode": "auto", ++ "orientation": "auto", ++ "reduceOptions": { ++ "calcs": [ ++ "lastNotNull" ++ ], ++ "fields": "", ++ "values": false ++ } ++ }, ++ "pluginVersion": "7", ++ "targets": [ ++ { ++ "expr": "sum(volume_manager_total_volumes{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\", state=\"actual_state_of_world\"})", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "title": "Actual Volume Count", ++ "transparent": false, ++ "type": "stat" + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 11, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, ++ "datasource": "$datasource", ++ "fieldConfig": { ++ "defaults": { + "links": [ + + ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ "mappings": [ + + ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} pod", - "refId": "A" - }, - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} pod", +- "refId": "A" +- }, +- { - "expr": "sum(rate(kubelet_pod_worker_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(kubelet_pod_worker_duration_seconds_count{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} worker", -@@ -1014,14 +1015,14 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} worker", +- "refId": "B" +- } +- ], +- "thresholds": [ +- +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Pod Start Rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ "thresholds": { ++ "mode": "absolute", ++ "steps": [ + + ] + }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] +- }, +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 12, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ +- +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ +- +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} pod", - "refId": "A" - }, - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} pod", +- "refId": "A" +- }, +- { - "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_worker_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_worker_duration_seconds_bucket{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} worker", -@@ -1129,7 +1130,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} worker", +- "refId": "B" +- } +- ], +- "thresholds": [ ++ "unit": "none" ++ } ++ }, ++ "gridPos": { ++ "h": 7, ++ "w": 4, ++ "x": 16, ++ "y": 0 ++ }, ++ "id": 6, ++ "links": [ + ++ ], ++ "options": { ++ "colorMode": "value", ++ "graphMode": "area", ++ "justifyMode": "auto", ++ "orientation": "auto", ++ "reduceOptions": { ++ "calcs": [ ++ "lastNotNull" + ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Pod Start Duration", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ +- +- ] +- }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ "fields": "", ++ "values": false ++ } ++ }, ++ "pluginVersion": "7", ++ "targets": [ ++ { ++ "expr": "sum(volume_manager_total_volumes{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",state=\"desired_state_of_world\"})", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" + } + ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "title": "Desired Volume Count", ++ "transparent": false, ++ "type": "stat" + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 13, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "hideEmpty": true, +- "hideZero": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, ++ "datasource": "$datasource", ++ "fieldConfig": { ++ "defaults": { + "links": [ + + ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ +- +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(storage_operation_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin)", -+ "expr": "sum(rate(storage_operation_duration_seconds_count{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", -@@ -1224,7 +1225,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ "mappings": [ + + ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Storage Operation Rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ "thresholds": { ++ "mode": "absolute", ++ "steps": [ + + ] + }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] +- }, +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 14, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "hideEmpty": true, +- "hideZero": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ +- +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ +- +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(storage_operation_errors_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin)", -+ "expr": "sum(rate(storage_operation_errors_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", -@@ -1332,7 +1333,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ "unit": "none" ++ } ++ }, ++ "gridPos": { ++ "h": 7, ++ "w": 4, ++ "x": 20, ++ "y": 0 ++ }, ++ "id": 7, ++ "links": [ + ++ ], ++ "options": { ++ "colorMode": "value", ++ "graphMode": "area", ++ "justifyMode": "auto", ++ "orientation": "auto", ++ "reduceOptions": { ++ "calcs": [ ++ "lastNotNull" + ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Storage Operation Error Rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ +- +- ] +- }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ "fields": "", ++ "values": false ++ } ++ }, ++ "pluginVersion": "7", ++ "targets": [ ++ { ++ "expr": "sum(rate(kubelet_node_config_error{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m]))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" + } + ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "title": "Config Error Count", ++ "transparent": false, ++ "type": "stat" + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ "aliasColors": { + +- }, +- "id": 15, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "hideEmpty": true, +- "hideZero": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 0, ++ "y": 7 ++ }, ++ "id": 8, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 12, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(storage_operation_duration_seconds_bucket{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(storage_operation_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", -@@ -1438,7 +1439,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(kubelet_runtime_operations_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (operation_type, instance)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Storage Operation Duration 99th quantile", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Operation Rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } +- ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ ] + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { ++ "aliasColors": { + +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 12, ++ "y": 7 ++ }, ++ "id": 9, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- }, +- "id": 16, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ +- +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(kubelet_cgroup_manager_duration_seconds_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_type)", -+ "expr": "sum(rate(kubelet_cgroup_manager_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_type)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}operation_type{{`}}`}}", -@@ -1531,7 +1532,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}operation_type{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(kubelet_runtime_operations_errors_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_type)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Cgroup manager operation rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Operation Error Rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + }, + { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] ++ }, ++ { ++ "aliasColors": { + +- }, +- "id": 17, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 24, ++ "x": 0, ++ "y": 14 ++ }, ++ "id": 10, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(kubelet_cgroup_manager_duration_seconds_bucket{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_type, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_cgroup_manager_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_type, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", -@@ -1638,7 +1639,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(kubelet_runtime_operations_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_type, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Cgroup manager 99th quantile", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Operation duration 99th quantile", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } +- ], +- "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ ] + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { ++ "aliasColors": { + +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "description": "Pod lifecycle event generator", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 0, ++ "y": 21 ++ }, ++ "id": 11, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- }, +- "id": 18, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} pod", ++ "refId": "A" ++ }, ++ { ++ "expr": "sum(rate(kubelet_pod_worker_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} worker", ++ "refId": "B" ++ } ++ ], ++ "thresholds": [ + +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(kubelet_pleg_relist_duration_seconds_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(kubelet_pleg_relist_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -1731,7 +1732,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Pod Start Rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "PLEG relist rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] ++ }, ++ { ++ "aliasColors": { + +- ] +- }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 12, ++ "y": 21 ++ }, ++ "id": 12, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} pod", ++ "refId": "A" + }, + { +- "aliasColors": { ++ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_worker_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} worker", ++ "refId": "B" ++ } ++ ], ++ "thresholds": [ + +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Pod Start Duration", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- }, +- "id": 19, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] ++ }, ++ { ++ "aliasColors": { + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 0, ++ "y": 28 ++ }, ++ "id": 13, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "hideEmpty": true, ++ "hideZero": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "spaceLength": 10, +- "span": 6, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_interval_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_interval_seconds_bucket{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -1837,7 +1838,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "PLEG relist interval", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(storage_operation_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Storage Operation Rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } ++ ] ++ }, ++ { ++ "aliasColors": { ++ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 12, ++ "y": 28 ++ }, ++ "id": 14, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "hideEmpty": true, ++ "hideZero": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ + ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", + "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(storage_operation_errors_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ ++ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Storage Operation Error Rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { ++ "aliasColors": { + +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 20, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 24, ++ "x": 0, ++ "y": 35 ++ }, ++ "id": 15, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "hideEmpty": true, ++ "hideZero": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 12, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -1943,28 +1944,28 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(storage_operation_duration_seconds_bucket{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_name, volume_plugin, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_name{{`}}`}} {{`{{`}}volume_plugin{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "PLEG relist duration", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Storage Operation Duration 99th quantile", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } ++ ] ++ }, ++ { ++ "aliasColors": { ++ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 0, ++ "y": 42 ++ }, ++ "id": 16, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ + ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", + "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(kubelet_cgroup_manager_duration_seconds_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_type)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}operation_type{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ ++ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Cgroup manager operation rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ "aliasColors": { + +- }, +- "id": 21, +- "legend": { +- "alignAsTable": false, +- "avg": false, +- "current": false, +- "max": false, +- "min": false, +- "rightSide": false, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": false +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 12, ++ "y": 42 ++ }, ++ "id": 17, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 12, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"2..\"}[5m]))", -+ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"2..\"}[5m]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "2xx", - "refId": "A" - }, - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "2xx", +- "refId": "A" +- }, +- { - "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"3..\"}[5m]))", -+ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"3..\"}[5m]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "3xx", - "refId": "B" - }, - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "3xx", +- "refId": "B" +- }, +- { - "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"4..\"}[5m]))", -+ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"4..\"}[5m]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "4xx", - "refId": "C" - }, - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "4xx", +- "refId": "C" +- }, +- { - "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"5..\"}[5m]))", -+ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"5..\"}[5m]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "5xx", -@@ -2070,7 +2071,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "5xx", +- "refId": "D" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(kubelet_cgroup_manager_duration_seconds_bucket{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, operation_type, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}operation_type{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "RPC Rate", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Cgroup manager 99th quantile", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "ops", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } ++ ] ++ }, ++ { ++ "aliasColors": { ++ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "description": "Pod lifecycle event generator", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 0, ++ "y": 49 ++ }, ++ "id": 18, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ + ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", + "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(kubelet_pleg_relist_duration_seconds_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance)", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ ++ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "PLEG relist rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ +- { +- "aliasColors": { ++ "aliasColors": { + +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { +- +- }, +- "id": 22, +- "legend": { +- "alignAsTable": true, +- "avg": false, +- "current": true, +- "max": false, +- "min": false, +- "rightSide": true, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": true +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 12, ++ "x": 12, ++ "y": 49 ++ }, ++ "id": 19, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 12, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, verb, url, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, verb, url, le))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}", -@@ -2176,7 +2177,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_interval_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Request duration 99th quantile", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "PLEG relist interval", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "s", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } ++ ] ++ }, ++ { ++ "aliasColors": { ++ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 24, ++ "x": 0, ++ "y": 56 ++ }, ++ "id": 20, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ + ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", + "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ ++ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "PLEG relist duration", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] + }, + { +- "collapse": false, +- "collapsed": false, +- "panels": [ ++ "aliasColors": { ++ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 24, ++ "x": 0, ++ "y": 63 ++ }, ++ "id": 21, ++ "legend": { ++ "alignAsTable": false, ++ "avg": false, ++ "current": false, ++ "max": false, ++ "min": false, ++ "rightSide": false, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": false ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"2..\"}[5m]))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "2xx", ++ "refId": "A" ++ }, ++ { ++ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"3..\"}[5m]))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "3xx", ++ "refId": "B" ++ }, + { +- "aliasColors": { ++ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"4..\"}[5m]))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "4xx", ++ "refId": "C" ++ }, ++ { ++ "expr": "sum(rate(rest_client_requests_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\",code=~\"5..\"}[5m]))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "5xx", ++ "refId": "D" ++ } ++ ], ++ "thresholds": [ + +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "RPC Rate", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- }, +- "id": 23, +- "legend": { +- "alignAsTable": false, +- "avg": false, +- "current": false, +- "max": false, +- "min": false, +- "rightSide": false, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": false +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "ops", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] ++ }, ++ { ++ "aliasColors": { + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 24, ++ "x": 0, ++ "y": 70 ++ }, ++ "id": 22, ++ "legend": { ++ "alignAsTable": true, ++ "avg": false, ++ "current": true, ++ "max": false, ++ "min": false, ++ "rightSide": true, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": true ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "spaceLength": 10, +- "span": 4, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "process_resident_memory_bytes{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}", -+ "expr": "process_resident_memory_bytes{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -2269,7 +2270,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Memory", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}[5m])) by (instance, verb, url, le))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}} {{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "bytes", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- }, +- { +- "format": "bytes", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- } +- ] ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Request duration 99th quantile", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + }, + { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ "format": "s", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] ++ }, ++ { ++ "aliasColors": { + +- }, +- "id": 24, +- "legend": { +- "alignAsTable": false, +- "avg": false, +- "current": false, +- "max": false, +- "min": false, +- "rightSide": false, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": false +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 8, ++ "x": 0, ++ "y": 77 ++ }, ++ "id": 23, ++ "legend": { ++ "alignAsTable": false, ++ "avg": false, ++ "current": false, ++ "max": false, ++ "min": false, ++ "rightSide": false, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": false ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 4, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "rate(process_cpu_seconds_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])", -+ "expr": "rate(process_cpu_seconds_total{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -2362,7 +2363,7 @@ - "steppedLine": false, - "targets": [ - { +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "process_resident_memory_bytes{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "CPU usage", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Memory", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "short", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- }, +- { +- "format": "short", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": 0, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "bytes", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + }, + { +- "aliasColors": { +- +- }, +- "bars": false, +- "dashLength": 10, +- "dashes": false, +- "datasource": "$datasource", +- "fill": 1, +- "fillGradient": 0, +- "gridPos": { ++ "format": "bytes", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] ++ }, ++ { ++ "aliasColors": { + +- }, +- "id": 25, +- "legend": { +- "alignAsTable": false, +- "avg": false, +- "current": false, +- "max": false, +- "min": false, +- "rightSide": false, +- "show": true, +- "sideWidth": null, +- "total": false, +- "values": false +- }, +- "lines": true, +- "linewidth": 1, +- "links": [ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 8, ++ "x": 8, ++ "y": 77 ++ }, ++ "id": 24, ++ "legend": { ++ "alignAsTable": false, ++ "avg": false, ++ "current": false, ++ "max": false, ++ "min": false, ++ "rightSide": false, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": false ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ + +- ], +- "nullPointMode": "null", +- "percentage": false, +- "pointradius": 5, +- "points": false, +- "renderer": "flot", +- "repeat": null, +- "seriesOverrides": [ ++ ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", ++ "repeat": null, ++ "seriesOverrides": [ + +- ], +- "spaceLength": 10, +- "span": 4, +- "stack": false, +- "steppedLine": false, +- "targets": [ +- { - "expr": "go_goroutines{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}", -+ "expr": "go_goroutines{cluster=\"$cluster\",job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics\",instance=~\"$instance\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}}", -@@ -2482,7 +2483,7 @@ +- "format": "time_series", +- "intervalFactor": 2, +- "legendFormat": "{{`{{`}}instance{{`}}`}}", +- "refId": "A" +- } +- ], +- "thresholds": [ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "rate(process_cpu_seconds_total{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[5m])", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ + +- ], +- "timeFrom": null, +- "timeShift": null, +- "title": "Goroutines", +- "tooltip": { +- "shared": false, +- "sort": 0, +- "value_type": "individual" +- }, +- "type": "graph", +- "xaxis": { +- "buckets": null, +- "mode": "time", +- "name": null, +- "show": true, +- "values": [ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "CPU usage", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ + +- ] +- }, +- "yaxes": [ +- { +- "format": "short", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- }, +- { +- "format": "short", +- "label": null, +- "logBase": 1, +- "max": null, +- "min": null, +- "show": true +- } +- ] ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "short", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "short", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true + } ++ ] ++ }, ++ { ++ "aliasColors": { ++ ++ }, ++ "bars": false, ++ "dashLength": 10, ++ "dashes": false, ++ "datasource": "$datasource", ++ "fill": 1, ++ "fillGradient": 0, ++ "gridPos": { ++ "h": 7, ++ "w": 8, ++ "x": 16, ++ "y": 77 ++ }, ++ "id": 25, ++ "legend": { ++ "alignAsTable": false, ++ "avg": false, ++ "current": false, ++ "max": false, ++ "min": false, ++ "rightSide": false, ++ "show": true, ++ "sideWidth": null, ++ "total": false, ++ "values": false ++ }, ++ "lines": true, ++ "linewidth": 1, ++ "links": [ ++ + ], ++ "nullPointMode": "null", ++ "percentage": false, ++ "pointradius": 5, ++ "points": false, ++ "renderer": "flot", + "repeat": null, +- "repeatIteration": null, +- "repeatRowId": null, +- "showTitle": false, +- "title": "Dashboard Row", +- "titleSize": "h6", +- "type": "row" ++ "seriesOverrides": [ ++ ++ ], ++ "spaceLength": 10, ++ "stack": false, ++ "steppedLine": false, ++ "targets": [ ++ { ++ "expr": "go_goroutines{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "{{`{{`}}instance{{`}}`}}", ++ "refId": "A" ++ } ++ ], ++ "thresholds": [ ++ ++ ], ++ "timeFrom": null, ++ "timeShift": null, ++ "title": "Goroutines", ++ "tooltip": { ++ "shared": true, ++ "sort": 0, ++ "value_type": "individual" ++ }, ++ "type": "graph", ++ "xaxis": { ++ "buckets": null, ++ "mode": "time", ++ "name": null, ++ "show": true, ++ "values": [ ++ ++ ] ++ }, ++ "yaxes": [ ++ { ++ "format": "short", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ }, ++ { ++ "format": "short", ++ "label": null, ++ "logBase": 1, ++ "max": null, ++ "min": null, ++ "show": true ++ } ++ ] + } + ], ++ "refresh": "10s", ++ "rows": [ ++ ++ ], + "schemaVersion": 14, + "style": "dark", + "tags": [ +@@ -2482,7 +2198,7 @@ "options": [ ], @@ -280,7 +4332,7 @@ "refresh": 2, "regex": "", "sort": 1, -@@ -2530,4 +2531,5 @@ +@@ -2530,4 +2246,5 @@ "uid": "3138fa155d5915769fbded898ac09fd9", "version": 0 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch index e2e2d07d0..30e508c31 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +++ charts/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch index 35ebc6fcf..b5c7c2da1 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +++ charts/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch index cd85c57ef..61b13e34f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +++ charts/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch index f514e83ec..6b1813816 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +++ charts/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch index 263330bc3..3428ed88a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/nodes.yaml +++ charts/templates/grafana/dashboards-1.14/nodes.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'nodes' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'nodes' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch index e7c77d5e0..88b93f321 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ charts/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch index 96bbe5747..4856a0e2a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/pod-total.yaml +++ charts/templates/grafana/dashboards-1.14/pod-total.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'pod-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'pod-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch index dc6c3bd10..cdb01c9a9 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ charts/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch index 0971545bb..7bac948ef 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/prometheus.yaml +++ charts/templates/grafana/dashboards-1.14/prometheus.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'prometheus' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'prometheus' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap @@ -9,3 +16,18 @@ name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -574,6 +574,14 @@ + "steppedLine": false, + "targets": [ + { ++ "expr": "sum by (job) (rate(prometheus_target_scrapes_exceeded_body_size_limit_total[1m]))", ++ "format": "time_series", ++ "intervalFactor": 2, ++ "legendFormat": "exceeded body size limit: {{`{{`}}job{{`}}`}}", ++ "legendLink": null, ++ "step": 10 ++ }, ++ { + "expr": "sum by (job) (rate(prometheus_target_scrapes_exceeded_sample_limit_total[1m]))", + "format": "time_series", + "intervalFactor": 2, diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch index 3d47af0fe..d7d3e47f2 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/grafana/dashboards-1.14/proxy.yaml +++ charts/templates/grafana/dashboards-1.14/proxy.yaml -@@ -4,11 +4,12 @@ +@@ -1,14 +1,15 @@ + {{- /* +-Generated from 'proxy' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'proxy' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch index dac1a5db5..bdfc01bf2 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/grafana/dashboards-1.14/scheduler.yaml +++ charts/templates/grafana/dashboards-1.14/scheduler.yaml -@@ -4,11 +4,12 @@ +@@ -1,14 +1,15 @@ + {{- /* +-Generated from 'scheduler' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'scheduler' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} @@ -28,72 +32,86 @@ "format": "time_series", "intervalFactor": 2, "legendFormat": "", -@@ -176,28 +181,28 @@ +@@ -176,31 +181,31 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(scheduler_e2e_scheduling_duration_seconds_count{cluster=\"$cluster\", job=\"kube-scheduler\", instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(scheduler_e2e_scheduling_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance)", ++ "expr": "sum(rate(scheduler_e2e_scheduling_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} e2e", +- "legendFormat": "{{`{{`}}instance{{`}}`}} e2e", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} e2e", "refId": "A" }, { - "expr": "sum(rate(scheduler_binding_duration_seconds_count{cluster=\"$cluster\", job=\"kube-scheduler\", instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(scheduler_binding_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance)", ++ "expr": "sum(rate(scheduler_binding_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} binding", +- "legendFormat": "{{`{{`}}instance{{`}}`}} binding", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} binding", "refId": "B" }, { - "expr": "sum(rate(scheduler_scheduling_algorithm_duration_seconds_count{cluster=\"$cluster\", job=\"kube-scheduler\", instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(scheduler_scheduling_algorithm_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance)", ++ "expr": "sum(rate(scheduler_scheduling_algorithm_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} scheduling algorithm", +- "legendFormat": "{{`{{`}}instance{{`}}`}} scheduling algorithm", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} scheduling algorithm", "refId": "C" }, { - "expr": "sum(rate(scheduler_volume_scheduling_duration_seconds_count{cluster=\"$cluster\", job=\"kube-scheduler\", instance=~\"$instance\"}[5m])) by (instance)", -+ "expr": "sum(rate(scheduler_volume_scheduling_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance)", ++ "expr": "sum(rate(scheduler_volume_scheduling_duration_seconds_count{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\", instance=~\"$instance\"}[5m])) by (cluster, instance)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} volume", -@@ -290,28 +295,28 @@ +- "legendFormat": "{{`{{`}}instance{{`}}`}} volume", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} volume", + "refId": "D" + } + ], +@@ -290,31 +295,31 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scheduler_e2e_scheduling_duration_seconds_bucket{cluster=\"$cluster\", job=\"kube-scheduler\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(scheduler_e2e_scheduling_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "expr": "histogram_quantile(0.99, sum(rate(scheduler_e2e_scheduling_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (cluster, instance, le))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} e2e", +- "legendFormat": "{{`{{`}}instance{{`}}`}} e2e", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} e2e", "refId": "A" }, { - "expr": "histogram_quantile(0.99, sum(rate(scheduler_binding_duration_seconds_bucket{cluster=\"$cluster\", job=\"kube-scheduler\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(scheduler_binding_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "expr": "histogram_quantile(0.99, sum(rate(scheduler_binding_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (cluster, instance, le))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} binding", +- "legendFormat": "{{`{{`}}instance{{`}}`}} binding", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} binding", "refId": "B" }, { - "expr": "histogram_quantile(0.99, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{cluster=\"$cluster\", job=\"kube-scheduler\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "expr": "histogram_quantile(0.99, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (cluster, instance, le))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} scheduling algorithm", +- "legendFormat": "{{`{{`}}instance{{`}}`}} scheduling algorithm", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} scheduling algorithm", "refId": "C" }, { - "expr": "histogram_quantile(0.99, sum(rate(scheduler_volume_scheduling_duration_seconds_bucket{cluster=\"$cluster\", job=\"kube-scheduler\",instance=~\"$instance\"}[5m])) by (instance, le))", -+ "expr": "histogram_quantile(0.99, sum(rate(scheduler_volume_scheduling_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (instance, le))", ++ "expr": "histogram_quantile(0.99, sum(rate(scheduler_volume_scheduling_duration_seconds_bucket{cluster=\"$cluster\", job=\"{{ include "exporter.kubeScheduler.jobName" . }}\",instance=~\"$instance\"}[5m])) by (cluster, instance, le))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{`{{`}}instance{{`}}`}} volume", +- "legendFormat": "{{`{{`}}instance{{`}}`}} volume", ++ "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} volume", + "refId": "D" + } + ], @@ -417,28 +422,28 @@ "steppedLine": false, "targets": [ diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch index b8a643abd..a8f77e53f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/grafana/dashboards-1.14/workload-total.yaml +++ charts/templates/grafana/dashboards-1.14/workload-total.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'workload-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml ++Generated from 'workload-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -8,7 +8,7 @@ apiVersion: v1 kind: ConfigMap diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml.patch new file mode 100644 index 000000000..dc6f77bd0 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRole + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml.patch new file mode 100644 index 000000000..cfc3cace7 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRoleBinding + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml.patch index fc7d98bcf..83f20e210 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml.patch @@ -1,5 +1,11 @@ --- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ charts/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: batch/v1 + kind: Job + metadata: @@ -32,9 +32,9 @@ containers: - name: create diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml.patch index 268aa50d4..a030f18fb 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml.patch @@ -1,5 +1,11 @@ --- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ charts/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: batch/v1 + kind: Job + metadata: @@ -32,9 +32,9 @@ containers: - name: patch diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml.patch new file mode 100644 index 000000000..6e2d4f9a9 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: policy/v1beta1 + kind: PodSecurityPolicy + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml.patch new file mode 100644 index 000000000..2a437d1aa --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: rbac.authorization.k8s.io/v1 + kind: Role + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml.patch new file mode 100644 index 000000000..805b834a1 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: rbac.authorization.k8s.io/v1 + kind: RoleBinding + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml.patch new file mode 100644 index 000000000..24499efe2 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled .Values.prometheusOperator.admissionWebhooks.patch.enabled .Values.global.rbac.create (not .Values.prometheusOperator.admissionWebhooks.certManager.enabled) }} + apiVersion: v1 + kind: ServiceAccount + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml.patch new file mode 100644 index 000000000..42ab32577 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled }} + apiVersion: admissionregistration.k8s.io/v1 + kind: MutatingWebhookConfiguration + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml.patch new file mode 100644 index 000000000..6f62cddd8 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml.patch @@ -0,0 +1,8 @@ +--- charts-original/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml ++++ charts/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml +@@ -1,4 +1,4 @@ +-{{- if and .Values.prometheusOperator.admissionWebhooks.enabled }} ++{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.admissionWebhooks.enabled }} + apiVersion: admissionregistration.k8s.io/v1 + kind: ValidatingWebhookConfiguration + metadata: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch index 0165ec39d..254c54e6e 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch @@ -24,7 +24,19 @@ {{- end }} - --config-reloader-cpu={{ .Values.prometheusOperator.configReloaderCpu }} - --config-reloader-memory={{ .Values.prometheusOperator.configReloaderMemory }} -@@ -130,16 +130,16 @@ +@@ -78,6 +78,11 @@ + {{- if .Values.prometheusOperator.prometheusInstanceNamespaces }} + - --prometheus-instance-namespaces={{ .Values.prometheusOperator.prometheusInstanceNamespaces | join "," }} + {{- end }} ++ {{- if .Values.prometheusOperator.thanosImage.sha }} ++ - --thanos-default-base-image={{ .Values.prometheusOperator.thanosImage.repository }}:{{ .Values.prometheusOperator.thanosImage.tag }}@sha256:{{ .Values.prometheusOperator.thanosImage.sha }} ++ {{- else }} ++ - --thanos-default-base-image={{ .Values.prometheusOperator.thanosImage.repository }}:{{ .Values.prometheusOperator.thanosImage.tag }} ++ {{- end }} + {{- if .Values.prometheusOperator.thanosRulerInstanceNamespaces }} + - --thanos-ruler-instance-namespaces={{ .Values.prometheusOperator.thanosRulerInstanceNamespaces | join "," }} + {{- end }} +@@ -130,16 +135,16 @@ hostNetwork: true dnsPolicy: ClusterFirstWithHostNet {{- end }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch index bc1274417..87bdbdb55 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch @@ -34,7 +34,26 @@ {{ toYaml .Values.prometheus.prometheusSpec.tolerations | indent 4 }} {{- end }} {{- if .Values.prometheus.prometheusSpec.topologySpreadConstraints }} -@@ -266,7 +268,7 @@ +@@ -254,11 +256,17 @@ + name: {{ .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.name }} + key: {{ .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.key }} + {{- end }} +-{{- if .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs }} ++{{- if or .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs .Values.prometheus.prometheusSpec.additionalAlertManagerConfigsSecret }} + additionalAlertManagerConfigs: ++{{- if .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-am-confg + key: additional-alertmanager-configs.yaml + {{- end }} ++{{- if .Values.prometheus.prometheusSpec.additionalAlertManagerConfigsSecret }} ++ name: {{ .Values.prometheus.prometheusSpec.additionalAlertManagerConfigsSecret.name }} ++ key: {{ .Values.prometheus.prometheusSpec.additionalAlertManagerConfigsSecret.key }} ++{{- end }} ++{{- end }} + {{- if .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs }} + additionalAlertRelabelConfigs: + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-am-relabel-confg +@@ -266,7 +274,7 @@ {{- end }} {{- if .Values.prometheus.prometheusSpec.containers }} containers: @@ -43,7 +62,7 @@ {{- end }} {{- if .Values.prometheus.prometheusSpec.initContainers }} initContainers: -@@ -282,6 +284,7 @@ +@@ -282,6 +290,7 @@ {{- if .Values.prometheus.prometheusSpec.disableCompaction }} disableCompaction: {{ .Values.prometheus.prometheusSpec.disableCompaction }} {{- end }} @@ -51,7 +70,7 @@ portName: {{ .Values.prometheus.prometheusSpec.portName }} {{- end }} {{- if .Values.prometheus.prometheusSpec.volumes }} -@@ -326,3 +329,4 @@ +@@ -326,3 +335,4 @@ {{- if .Values.prometheus.prometheusSpec.allowOverlappingBlocks }} allowOverlappingBlocks: {{ .Values.prometheus.prometheusSpec.allowOverlappingBlocks }} {{- end }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch new file mode 100644 index 000000000..d1e0d42ee --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch @@ -0,0 +1,176 @@ +--- charts-original/templates/prometheus/rules-1.14/alertmanager.rules.yaml ++++ charts/templates/prometheus/rules-1.14/alertmanager.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/alertmanager-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -26,41 +26,146 @@ + groups: + - name: alertmanager.rules + rules: +- - alert: AlertmanagerConfigInconsistent ++ - alert: AlertmanagerFailedReload ++ annotations: ++ description: Configuration has failed to load for {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod{{`}}`}}. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerfailedreload ++ summary: Reloading an Alertmanager configuration has failed. ++ expr: |- ++ # Without max_over_time, failed scrapes could create false negatives, see ++ # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details. ++ max_over_time(alertmanager_config_last_reload_successful{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[5m]) == 0 ++ for: 10m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: AlertmanagerMembersInconsistent ++ annotations: ++ description: Alertmanager {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod{{`}}`}} has only found {{`{{`}} $value {{`}}`}} members of the {{`{{`}}$labels.job{{`}}`}} cluster. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagermembersinconsistent ++ summary: A member of an Alertmanager cluster has not found all other cluster members. ++ expr: |- ++ # Without max_over_time, failed scrapes could create false negatives, see ++ # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details. ++ max_over_time(alertmanager_cluster_members{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[5m]) ++ < on (namespace,service) group_left ++ count by (namespace,service) (max_over_time(alertmanager_cluster_members{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[5m])) ++ for: 15m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: AlertmanagerFailedToSendAlerts ++ annotations: ++ description: Alertmanager {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod{{`}}`}} failed to send {{`{{`}} $value | humanizePercentage {{`}}`}} of notifications to {{`{{`}} $labels.integration {{`}}`}}. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerfailedtosendalerts ++ summary: An Alertmanager instance failed to send notifications. ++ expr: |- ++ ( ++ rate(alertmanager_notifications_failed_total{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[5m]) ++ / ++ rate(alertmanager_notifications_total{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[5m]) ++ ) ++ > 0.01 ++ for: 5m ++ labels: ++ severity: warning ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: AlertmanagerClusterFailedToSendAlerts + annotations: +- message: 'The configuration of the instances of the Alertmanager cluster `{{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.service {{`}}`}}` are out of sync. +- +- {{`{{`}} range printf "alertmanager_config_hash{namespace=\"%s\",service=\"%s\"}" $labels.namespace $labels.service | query {{`}}`}} +- +- Configuration hash for pod {{`{{`}} .Labels.pod {{`}}`}} is "{{`{{`}} printf "%.f" .Value {{`}}`}}" +- +- {{`{{`}} end {{`}}`}} +- +- ' +- expr: count by(namespace,service) (count_values by(namespace,service) ("config_hash", alertmanager_config_hash{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"})) != 1 ++ description: The minimum notification failure rate to {{`{{`}} $labels.integration {{`}}`}} sent from any instance in the {{`{{`}}$labels.job{{`}}`}} cluster is {{`{{`}} $value | humanizePercentage {{`}}`}}. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerclusterfailedtosendalerts ++ summary: All Alertmanager instances in a cluster failed to send notifications to a critical integration. ++ expr: |- ++ min by (namespace,service, integration) ( ++ rate(alertmanager_notifications_failed_total{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}", integration=~`.*`}[5m]) ++ / ++ rate(alertmanager_notifications_total{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}", integration=~`.*`}[5m]) ++ ) ++ > 0.01 + for: 5m + labels: + severity: critical + {{- if .Values.defaultRules.additionalRuleLabels }} + {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} +- - alert: AlertmanagerFailedReload ++ - alert: AlertmanagerClusterFailedToSendAlerts + annotations: +- message: Reloading Alertmanager's configuration has failed for {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod{{`}}`}}. +- expr: alertmanager_config_last_reload_successful{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"} == 0 +- for: 10m ++ description: The minimum notification failure rate to {{`{{`}} $labels.integration {{`}}`}} sent from any instance in the {{`{{`}}$labels.job{{`}}`}} cluster is {{`{{`}} $value | humanizePercentage {{`}}`}}. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerclusterfailedtosendalerts ++ summary: All Alertmanager instances in a cluster failed to send notifications to a non-critical integration. ++ expr: |- ++ min by (namespace,service, integration) ( ++ rate(alertmanager_notifications_failed_total{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}", integration!~`.*`}[5m]) ++ / ++ rate(alertmanager_notifications_total{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}", integration!~`.*`}[5m]) ++ ) ++ > 0.01 ++ for: 5m + labels: + severity: warning + {{- if .Values.defaultRules.additionalRuleLabels }} + {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} +- - alert: AlertmanagerMembersInconsistent ++ - alert: AlertmanagerConfigInconsistent ++ annotations: ++ description: Alertmanager instances within the {{`{{`}}$labels.job{{`}}`}} cluster have different configurations. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerconfiginconsistent ++ summary: Alertmanager instances within the same cluster have different configurations. ++ expr: |- ++ count by (namespace,service) ( ++ count_values by (namespace,service) ("config_hash", alertmanager_config_hash{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}) ++ ) ++ != 1 ++ for: 20m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: AlertmanagerClusterDown ++ annotations: ++ description: '{{`{{`}} $value | humanizePercentage {{`}}`}} of Alertmanager instances within the {{`{{`}}$labels.job{{`}}`}} cluster have been up for less than half of the last 5m.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerclusterdown ++ summary: Half or more of the Alertmanager instances within the same cluster are down. ++ expr: |- ++ ( ++ count by (namespace,service) ( ++ avg_over_time(up{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[5m]) < 0.5 ++ ) ++ / ++ count by (namespace,service) ( ++ up{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"} ++ ) ++ ) ++ >= 0.5 ++ for: 5m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: AlertmanagerClusterCrashlooping + annotations: +- message: Alertmanager has not found all other members of the cluster. ++ description: '{{`{{`}} $value | humanizePercentage {{`}}`}} of Alertmanager instances within the {{`{{`}}$labels.job{{`}}`}} cluster have restarted at least 5 times in the last 10m.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-alertmanagerclustercrashlooping ++ summary: Half or more of the Alertmanager instances within the same cluster are crashlooping. + expr: |- +- alertmanager_cluster_members{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"} +- != on (service) GROUP_LEFT() +- count by (service) (alertmanager_cluster_members{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}) ++ ( ++ count by (namespace,service) ( ++ changes(process_start_time_seconds{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"}[10m]) > 4 ++ ) ++ / ++ count by (namespace,service) ( ++ up{job="{{ $alertmanagerJob }}",namespace="{{ $namespace }}"} ++ ) ++ ) ++ >= 0.5 + for: 5m + labels: + severity: critical diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/general.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/general.rules.yaml.patch new file mode 100644 index 000000000..51d71a081 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/general.rules.yaml.patch @@ -0,0 +1,38 @@ +--- charts-original/templates/prometheus/rules-1.14/general.rules.yaml ++++ charts/templates/prometheus/rules-1.14/general.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kube-prometheus-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -26,7 +26,9 @@ + rules: + - alert: TargetDown + annotations: +- message: '{{`{{`}} printf "%.4g" $value {{`}}`}}% of the {{`{{`}} $labels.job {{`}}`}}/{{`{{`}} $labels.service {{`}}`}} targets in {{`{{`}} $labels.namespace {{`}}`}} namespace are down.' ++ description: '{{`{{`}} printf "%.4g" $value {{`}}`}}% of the {{`{{`}} $labels.job {{`}}`}}/{{`{{`}} $labels.service {{`}}`}} targets in {{`{{`}} $labels.namespace {{`}}`}} namespace are down.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-targetdown ++ summary: One or more targets are unreachable. + expr: 100 * (count(up == 0) BY (job, namespace, service) / count(up) BY (job, namespace, service)) > 10 + for: 10m + labels: +@@ -36,7 +38,7 @@ + {{- end }} + - alert: Watchdog + annotations: +- message: 'This is an alert meant to ensure that the entire alerting pipeline is functional. ++ description: 'This is an alert meant to ensure that the entire alerting pipeline is functional. + + This alert is always firing, therefore it should always be firing in Alertmanager + +@@ -47,6 +49,8 @@ + "DeadMansSnitch" integration in PagerDuty. + + ' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-watchdog ++ summary: An alert that should always be firing to certify that Alertmanager is working properly. + expr: vector(1) + labels: + severity: none diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/k8s.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/k8s.rules.yaml.patch index fa81d2ae6..106b71e14 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/k8s.rules.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/k8s.rules.yaml.patch @@ -1,15 +1,23 @@ --- charts-original/templates/prometheus/rules-1.14/k8s.rules.yaml +++ charts/templates/prometheus/rules-1.14/k8s.rules.yaml -@@ -26,31 +26,31 @@ +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'k8s.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'k8s.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -26,36 +26,42 @@ rules: - expr: |- sum by (cluster, namespace, pod, container) ( - rate(container_cpu_usage_seconds_total{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}[5m]) -+ rate(container_cpu_usage_seconds_total{job="{{ include "exporter.kubelet.jobName" . }}", metrics_path="/metrics/cadvisor", image!=""}[5m]) ++ irate(container_cpu_usage_seconds_total{job="{{ include "exporter.kubelet.jobName" . }}", metrics_path="/metrics/cadvisor", image!=""}[5m]) ) * on (cluster, namespace, pod) group_left(node) topk by (cluster, namespace, pod) ( 1, max by(cluster, namespace, pod, node) (kube_pod_info{node!=""}) ) - record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate +- record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate ++ record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate - expr: |- - container_memory_working_set_bytes{job="kubelet", metrics_path="/metrics/cadvisor", image!=""} + container_memory_working_set_bytes{job="{{ include "exporter.kubelet.jobName" . }}", metrics_path="/metrics/cadvisor", image!=""} @@ -37,3 +45,68 @@ * on (namespace, pod) group_left(node) topk by(namespace, pod) (1, max by(namespace, pod, node) (kube_pod_info{node!=""}) ) + record: node_namespace_pod_container:container_memory_swap + - expr: |- ++ kube_pod_container_resource_requests{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster) ++ group_left() max by (namespace, pod) ( ++ (kube_pod_status_phase{phase=~"Pending|Running"} == 1) ++ ) ++ record: cluster:namespace:pod_memory:active:kube_pod_container_resource_requests ++ - expr: |- + sum by (namespace, cluster) ( + sum by (namespace, pod, cluster) ( + max by (namespace, pod, container, cluster) ( +@@ -67,6 +73,12 @@ + ) + record: namespace_memory:kube_pod_container_resource_requests:sum + - expr: |- ++ kube_pod_container_resource_requests{resource="cpu",job="kube-state-metrics"} * on (namespace, pod, cluster) ++ group_left() max by (namespace, pod) ( ++ (kube_pod_status_phase{phase=~"Pending|Running"} == 1) ++ ) ++ record: cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests ++ - expr: |- + sum by (namespace, cluster) ( + sum by (namespace, pod, cluster) ( + max by (namespace, pod, container, cluster) ( +@@ -78,6 +90,40 @@ + ) + record: namespace_cpu:kube_pod_container_resource_requests:sum + - expr: |- ++ kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster) ++ group_left() max by (namespace, pod) ( ++ (kube_pod_status_phase{phase=~"Pending|Running"} == 1) ++ ) ++ record: cluster:namespace:pod_memory:active:kube_pod_container_resource_limits ++ - expr: |- ++ sum by (namespace, cluster) ( ++ sum by (namespace, pod, cluster) ( ++ max by (namespace, pod, container, cluster) ( ++ kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"} ++ ) * on(namespace, pod, cluster) group_left() max by (namespace, pod) ( ++ kube_pod_status_phase{phase=~"Pending|Running"} == 1 ++ ) ++ ) ++ ) ++ record: namespace_memory:kube_pod_container_resource_limits:sum ++ - expr: |- ++ kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"} * on (namespace, pod, cluster) ++ group_left() max by (namespace, pod) ( ++ (kube_pod_status_phase{phase=~"Pending|Running"} == 1) ++ ) ++ record: cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits ++ - expr: |- ++ sum by (namespace, cluster) ( ++ sum by (namespace, pod, cluster) ( ++ max by (namespace, pod, container, cluster) ( ++ kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"} ++ ) * on(namespace, pod, cluster) group_left() max by (namespace, pod) ( ++ kube_pod_status_phase{phase=~"Pending|Running"} == 1 ++ ) ++ ) ++ ) ++ record: namespace_cpu:kube_pod_container_resource_limits:sum ++ - expr: |- + max by (cluster, namespace, workload, pod) ( + label_replace( + label_replace( diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml.patch new file mode 100644 index 000000000..91c83bf2b --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml.patch @@ -0,0 +1,187 @@ +--- charts-original/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml ++++ charts/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -25,60 +25,70 @@ + - interval: 3m + name: kube-apiserver-availability.rules + rules: ++ - expr: avg_over_time(code_verb:apiserver_request_total:increase1h[30d]) * 24 * 30 ++ record: code_verb:apiserver_request_total:increase30d ++ - expr: sum by (cluster, code) (code_verb:apiserver_request_total:increase30d{verb=~"LIST|GET"}) ++ labels: ++ verb: read ++ record: code:apiserver_request_total:increase30d ++ - expr: sum by (cluster, code) (code_verb:apiserver_request_total:increase30d{verb=~"POST|PUT|PATCH|DELETE"}) ++ labels: ++ verb: write ++ record: code:apiserver_request_total:increase30d + - expr: |- + 1 - ( + ( + # write too slow +- sum(increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d])) + - +- sum(increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d])) + ) + + ( + # read too slow +- sum(increase(apiserver_request_duration_seconds_count{verb=~"LIST|GET"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_count{verb=~"LIST|GET"}[30d])) + - + ( + ( +- sum(increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope=~"resource|",le="0.1"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope=~"resource|",le="1"}[30d])) + or + vector(0) + ) + + +- sum(increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="namespace",le="0.5"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="namespace",le="5"}[30d])) + + +- sum(increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="cluster",le="5"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="cluster",le="40"}[30d])) + ) + ) + + # errors +- sum(code:apiserver_request_total:increase30d{code=~"5.."} or vector(0)) ++ sum by (cluster) (code:apiserver_request_total:increase30d{code=~"5.."} or vector(0)) + ) + / +- sum(code:apiserver_request_total:increase30d) ++ sum by (cluster) (code:apiserver_request_total:increase30d) + labels: + verb: all + record: apiserver_request:availability30d + - expr: |- + 1 - ( +- sum(increase(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30d])) + - + ( + # too slow + ( +- sum(increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[30d])) + or + vector(0) + ) + + +- sum(increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[30d])) + + +- sum(increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[30d])) + ) + + + # errors +- sum(code:apiserver_request_total:increase30d{verb="read",code=~"5.."} or vector(0)) ++ sum by (cluster) (code:apiserver_request_total:increase30d{verb="read",code=~"5.."} or vector(0)) + ) + / +- sum(code:apiserver_request_total:increase30d{verb="read"}) ++ sum by (cluster) (code:apiserver_request_total:increase30d{verb="read"}) + labels: + verb: read + record: apiserver_request:availability30d +@@ -86,75 +96,33 @@ + 1 - ( + ( + # too slow +- sum(increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d])) + - +- sum(increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d])) ++ sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d])) + ) + + + # errors +- sum(code:apiserver_request_total:increase30d{verb="write",code=~"5.."} or vector(0)) ++ sum by (cluster) (code:apiserver_request_total:increase30d{verb="write",code=~"5.."} or vector(0)) + ) + / +- sum(code:apiserver_request_total:increase30d{verb="write"}) ++ sum by (cluster) (code:apiserver_request_total:increase30d{verb="write"}) + labels: + verb: write + record: apiserver_request:availability30d +- - expr: avg_over_time(code_verb:apiserver_request_total:increase1h[30d]) * 24 * 30 +- record: code_verb:apiserver_request_total:increase30d +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="LIST",code=~"2.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="GET",code=~"2.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="POST",code=~"2.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PUT",code=~"2.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PATCH",code=~"2.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="DELETE",code=~"2.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="LIST",code=~"3.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="GET",code=~"3.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="POST",code=~"3.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PUT",code=~"3.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PATCH",code=~"3.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="DELETE",code=~"3.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="LIST",code=~"4.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="GET",code=~"4.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="POST",code=~"4.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PUT",code=~"4.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PATCH",code=~"4.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="DELETE",code=~"4.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="LIST",code=~"5.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="GET",code=~"5.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="POST",code=~"5.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PUT",code=~"5.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="PATCH",code=~"5.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code, verb) (increase(apiserver_request_total{job="apiserver",verb="DELETE",code=~"5.."}[1h])) +- record: code_verb:apiserver_request_total:increase1h +- - expr: sum by (code) (code_verb:apiserver_request_total:increase30d{verb=~"LIST|GET"}) ++ - expr: sum by (cluster,code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m])) + labels: + verb: read +- record: code:apiserver_request_total:increase30d +- - expr: sum by (code) (code_verb:apiserver_request_total:increase30d{verb=~"POST|PUT|PATCH|DELETE"}) ++ record: code_resource:apiserver_request_total:rate5m ++ - expr: sum by (cluster,code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) + labels: + verb: write +- record: code:apiserver_request_total:increase30d ++ record: code_resource:apiserver_request_total:rate5m ++ - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"2.."}[1h])) ++ record: code_verb:apiserver_request_total:increase1h ++ - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"3.."}[1h])) ++ record: code_verb:apiserver_request_total:increase1h ++ - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"4.."}[1h])) ++ record: code_verb:apiserver_request_total:increase1h ++ - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"5.."}[1h])) ++ record: code_verb:apiserver_request_total:increase1h + {{- end }} +\ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml.patch new file mode 100644 index 000000000..95059629b --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml ++++ charts/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml.patch new file mode 100644 index 000000000..16254e9a1 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml.patch @@ -0,0 +1,401 @@ +--- charts-original/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml ++++ charts/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -28,26 +28,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[1d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[1d])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[1d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[1d])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[1d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[1d])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[1d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[1d])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1d])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1d])) + labels: + verb: read + record: apiserver_request:burnrate1d +@@ -55,26 +55,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[1h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[1h])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[1h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[1h])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[1h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[1h])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[1h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[1h])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[1h])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[1h])) + labels: + verb: read + record: apiserver_request:burnrate1h +@@ -82,26 +82,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[2h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[2h])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[2h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[2h])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[2h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[2h])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[2h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[2h])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[2h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[2h])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[2h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[2h])) + labels: + verb: read + record: apiserver_request:burnrate2h +@@ -109,26 +109,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30m])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[30m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[30m])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[30m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[30m])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[30m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[30m])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[30m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[30m])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[30m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[30m])) + labels: + verb: read + record: apiserver_request:burnrate30m +@@ -136,26 +136,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[3d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[3d])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[3d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[3d])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[3d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[3d])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[3d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[3d])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[3d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[3d])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[3d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[3d])) + labels: + verb: read + record: apiserver_request:burnrate3d +@@ -163,26 +163,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[5m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[5m])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[5m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[5m])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[5m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[5m])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[5m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[5m])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[5m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[5m])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m])) + labels: + verb: read + record: apiserver_request:burnrate5m +@@ -190,26 +190,26 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[6h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[6h])) + - + ( + ( +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[6h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="0.1"}[6h])) + or + vector(0) + ) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[6h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="0.5"}[6h])) + + +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[6h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="5"}[6h])) + ) + ) + + + # errors +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[6h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET",code=~"5.."}[6h])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[6h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[6h])) + labels: + verb: read + record: apiserver_request:burnrate6h +@@ -217,15 +217,15 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[1d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[1d])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1d])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1d])) + labels: + verb: write + record: apiserver_request:burnrate1d +@@ -233,15 +233,15 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[1h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[1h])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[1h])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[1h])) + labels: + verb: write + record: apiserver_request:burnrate1h +@@ -249,15 +249,15 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[2h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[2h])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[2h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[2h])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[2h])) + labels: + verb: write + record: apiserver_request:burnrate2h +@@ -265,15 +265,15 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[30m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[30m])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[30m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[30m])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[30m])) + labels: + verb: write + record: apiserver_request:burnrate30m +@@ -281,15 +281,15 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[3d])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[3d])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[3d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[3d])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[3d])) + labels: + verb: write + record: apiserver_request:burnrate3d +@@ -297,15 +297,15 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[5m])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[5m])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[5m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[5m])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) + labels: + verb: write + record: apiserver_request:burnrate5m +@@ -313,32 +313,32 @@ + ( + ( + # too slow +- sum(rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_count{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h])) + - +- sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[6h])) ++ sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",le="1"}[6h])) + ) + + +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[6h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE",code=~"5.."}[6h])) + ) + / +- sum(rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h])) ++ sum by (cluster) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[6h])) + labels: + verb: write + record: apiserver_request:burnrate6h +- - expr: sum by (code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m])) ++ - expr: sum by (cluster,code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m])) + labels: + verb: read + record: code_resource:apiserver_request_total:rate5m +- - expr: sum by (code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) ++ - expr: sum by (cluster,code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m])) + labels: + verb: write + record: code_resource:apiserver_request_total:rate5m +- - expr: histogram_quantile(0.99, sum by (le, resource) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET"}[5m]))) > 0 ++ - expr: histogram_quantile(0.99, sum by (cluster, le, resource) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET"}[5m]))) > 0 + labels: + quantile: '0.99' + verb: read + record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile +- - expr: histogram_quantile(0.99, sum by (le, resource) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m]))) > 0 ++ - expr: histogram_quantile(0.99, sum by (cluster, le, resource) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m]))) > 0 + labels: + quantile: '0.99' + verb: write diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml.patch new file mode 100644 index 000000000..c8cfc477c --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml ++++ charts/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kube-prometheus-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml.patch new file mode 100644 index 000000000..5a1df2dc1 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml ++++ charts/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kube-prometheus-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml.patch index bb8bd1bab..608956a8f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ charts/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml -@@ -4,7 +4,8 @@ +@@ -1,10 +1,11 @@ + {{- /* +-Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-state-metrics.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-state-metrics.yaml.patch new file mode 100644 index 000000000..e9926a673 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kube-state-metrics.yaml.patch @@ -0,0 +1,43 @@ +--- charts-original/templates/prometheus/rules-1.14/kube-state-metrics.yaml ++++ charts/templates/prometheus/rules-1.14/kube-state-metrics.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kube-state-metrics-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -56,4 +56,32 @@ + {{- if .Values.defaultRules.additionalRuleLabels }} + {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} ++ - alert: KubeStateMetricsShardingMismatch ++ annotations: ++ description: kube-state-metrics pods are running with different --total-shards configuration, some Kubernetes objects may be exposed multiple times or not exposed at all. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubestatemetricsshardingmismatch ++ summary: kube-state-metrics sharding is misconfigured. ++ expr: stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) != 0 ++ for: 15m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: KubeStateMetricsShardsMissing ++ annotations: ++ description: kube-state-metrics shards are missing, some Kubernetes objects are not being exposed. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubestatemetricsshardsmissing ++ summary: kube-state-metrics shards are missing. ++ expr: |- ++ 2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) - 1 ++ - ++ sum( 2 ^ max by (shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) ) ++ != 0 ++ for: 15m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} + {{- end }} +\ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubelet.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubelet.rules.yaml.patch index 8ca17f86c..330af41bb 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubelet.rules.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubelet.rules.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/prometheus/rules-1.14/kubelet.rules.yaml +++ charts/templates/prometheus/rules-1.14/kubelet.rules.yaml -@@ -4,7 +4,8 @@ +@@ -1,10 +1,11 @@ + {{- /* +-Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-apps.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-apps.yaml.patch new file mode 100644 index 000000000..df93921c3 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-apps.yaml.patch @@ -0,0 +1,79 @@ +--- charts-original/templates/prometheus/rules-1.14/kubernetes-apps.yaml ++++ charts/templates/prometheus/rules-1.14/kubernetes-apps.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -30,7 +30,10 @@ + description: Pod {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod {{`}}`}} ({{`{{`}} $labels.container {{`}}`}}) is restarting {{`{{`}} printf "%.2f" $value {{`}}`}} times / 10 minutes. + runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubepodcrashlooping + summary: Pod is crash looping. +- expr: rate(kube_pod_container_status_restarts_total{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}[10m]) * 60 * 5 > 0 ++ expr: |- ++ increase(kube_pod_container_status_restarts_total{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}[10m]) > 0 ++ and ++ kube_pod_container_status_waiting{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} == 1 + for: 15m + labels: + severity: warning +@@ -79,7 +82,7 @@ + expr: |- + ( + kube_deployment_spec_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} +- != ++ > + kube_deployment_status_replicas_available{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} + ) and ( + changes(kube_deployment_status_replicas_updated{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}[10m]) +@@ -257,23 +260,23 @@ + {{- end }} + - alert: KubeHpaReplicasMismatch + annotations: +- description: HPA {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.hpa {{`}}`}} has not matched the desired number of replicas for longer than 15 minutes. ++ description: HPA {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.horizontalpodautoscaler {{`}}`}} has not matched the desired number of replicas for longer than 15 minutes. + runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubehpareplicasmismatch + summary: HPA has not matched descired number of replicas. + expr: |- +- (kube_hpa_status_desired_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} ++ (kube_horizontalpodautoscaler_status_desired_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} + != +- kube_hpa_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}) ++ kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}) + and +- (kube_hpa_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} ++ (kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} + > +- kube_hpa_spec_min_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}) ++ kube_horizontalpodautoscaler_spec_min_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}) + and +- (kube_hpa_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} ++ (kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} + < +- kube_hpa_spec_max_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}) ++ kube_horizontalpodautoscaler_spec_max_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}) + and +- changes(kube_hpa_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}[15m]) == 0 ++ changes(kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"}[15m]) == 0 + for: 15m + labels: + severity: warning +@@ -282,13 +285,13 @@ + {{- end }} + - alert: KubeHpaMaxedOut + annotations: +- description: HPA {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.hpa {{`}}`}} has been running at max replicas for longer than 15 minutes. ++ description: HPA {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.horizontalpodautoscaler {{`}}`}} has been running at max replicas for longer than 15 minutes. + runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubehpamaxedout + summary: HPA is running at max replicas + expr: |- +- kube_hpa_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} ++ kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} + == +- kube_hpa_spec_max_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} ++ kube_horizontalpodautoscaler_spec_max_replicas{job="kube-state-metrics", namespace=~"{{ $targetNamespace }}"} + for: 15m + labels: + severity: warning diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-resources.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-resources.yaml.patch new file mode 100644 index 000000000..fe9a2a206 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-resources.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/kubernetes-resources.yaml ++++ charts/templates/prometheus/rules-1.14/kubernetes-resources.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-storage.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-storage.yaml.patch index f6b8f2f45..f53fcb832 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-storage.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-storage.yaml.patch @@ -1,6 +1,13 @@ --- charts-original/templates/prometheus/rules-1.14/kubernetes-storage.yaml +++ charts/templates/prometheus/rules-1.14/kubernetes-storage.yaml -@@ -31,9 +31,9 @@ +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -31,10 +31,12 @@ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubepersistentvolumefillingup summary: PersistentVolume is filling up. expr: |- @@ -10,9 +17,12 @@ - kubelet_volume_stats_capacity_bytes{job="kubelet", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"} + kubelet_volume_stats_capacity_bytes{job="{{ include "exporter.kubelet.jobName" . }}", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"} < 0.03 ++ and ++ kubelet_volume_stats_used_bytes{job="{{ include "exporter.kubelet.jobName" . }}", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"} > 0 for: 1m labels: -@@ -48,12 +48,12 @@ + severity: critical +@@ -48,12 +50,14 @@ summary: PersistentVolume is filling up. expr: |- ( @@ -24,6 +34,8 @@ ) < 0.15 and - predict_linear(kubelet_volume_stats_available_bytes{job="kubelet", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"}[6h], 4 * 24 * 3600) < 0 ++ kubelet_volume_stats_used_bytes{job="{{ include "exporter.kubelet.jobName" . }}", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"} > 0 ++ and + predict_linear(kubelet_volume_stats_available_bytes{job="{{ include "exporter.kubelet.jobName" . }}", namespace=~"{{ $targetNamespace }}", metrics_path="/metrics"}[6h], 4 * 24 * 3600) < 0 for: 1h labels: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml.patch new file mode 100644 index 000000000..1c930cd01 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml ++++ charts/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml.patch index 8e20b6f84..61f199239 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml +++ charts/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml -@@ -4,7 +4,8 @@ +@@ -1,10 +1,11 @@ + {{- /* +-Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml.patch index a7c18d80c..e910b2e05 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml.patch @@ -1,5 +1,12 @@ --- charts-original/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +++ charts/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} @@ -96,7 +96,7 @@ description: Kubelet Pod startup 99th percentile latency is {{`{{`}} $value {{`}}`}} seconds on node {{`{{`}} $labels.node {{`}}`}}. runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubeletpodstartuplatencyhigh diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml.patch index 0c423a934..4afce5910 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml.patch @@ -1,6 +1,10 @@ --- charts-original/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml +++ charts/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml -@@ -4,7 +4,8 @@ +@@ -1,10 +1,11 @@ + {{- /* +-Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system.yaml.patch new file mode 100644 index 000000000..3693d420b --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/kubernetes-system.yaml ++++ charts/templates/prometheus/rules-1.14/kubernetes-system.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-exporter.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-exporter.rules.yaml.patch new file mode 100644 index 000000000..d74e1d88d --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-exporter.rules.yaml.patch @@ -0,0 +1,67 @@ +--- charts-original/templates/prometheus/rules-1.14/node-exporter.rules.yaml ++++ charts/templates/prometheus/rules-1.14/node-exporter.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/node-exporter-prometheusRule.yaml ++Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/node-exporter-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -33,9 +33,9 @@ + record: instance:node_num_cpu:sum + - expr: |- + 1 - avg without (cpu, mode) ( +- rate(node_cpu_seconds_total{job="node-exporter", mode="idle"}[1m]) ++ rate(node_cpu_seconds_total{job="node-exporter", mode="idle"}[5m]) + ) +- record: instance:node_cpu_utilisation:rate1m ++ record: instance:node_cpu_utilisation:rate5m + - expr: |- + ( + node_load1{job="node-exporter"} +@@ -50,30 +50,30 @@ + node_memory_MemTotal_bytes{job="node-exporter"} + ) + record: instance:node_memory_utilisation:ratio +- - expr: rate(node_vmstat_pgmajfault{job="node-exporter"}[1m]) +- record: instance:node_vmstat_pgmajfault:rate1m +- - expr: rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m]) +- record: instance_device:node_disk_io_time_seconds:rate1m +- - expr: rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m]) +- record: instance_device:node_disk_io_time_weighted_seconds:rate1m ++ - expr: rate(node_vmstat_pgmajfault{job="node-exporter"}[5m]) ++ record: instance:node_vmstat_pgmajfault:rate5m ++ - expr: rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[5m]) ++ record: instance_device:node_disk_io_time_seconds:rate5m ++ - expr: rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[5m]) ++ record: instance_device:node_disk_io_time_weighted_seconds:rate5m + - expr: |- + sum without (device) ( +- rate(node_network_receive_bytes_total{job="node-exporter", device!="lo"}[1m]) ++ rate(node_network_receive_bytes_total{job="node-exporter", device!="lo"}[5m]) + ) +- record: instance:node_network_receive_bytes_excluding_lo:rate1m ++ record: instance:node_network_receive_bytes_excluding_lo:rate5m + - expr: |- + sum without (device) ( +- rate(node_network_transmit_bytes_total{job="node-exporter", device!="lo"}[1m]) ++ rate(node_network_transmit_bytes_total{job="node-exporter", device!="lo"}[5m]) + ) +- record: instance:node_network_transmit_bytes_excluding_lo:rate1m ++ record: instance:node_network_transmit_bytes_excluding_lo:rate5m + - expr: |- + sum without (device) ( +- rate(node_network_receive_drop_total{job="node-exporter", device!="lo"}[1m]) ++ rate(node_network_receive_drop_total{job="node-exporter", device!="lo"}[5m]) + ) +- record: instance:node_network_receive_drop_excluding_lo:rate1m ++ record: instance:node_network_receive_drop_excluding_lo:rate5m + - expr: |- + sum without (device) ( +- rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[1m]) ++ rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[5m]) + ) +- record: instance:node_network_transmit_drop_excluding_lo:rate1m ++ record: instance:node_network_transmit_drop_excluding_lo:rate5m + {{- end }} +\ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-exporter.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-exporter.yaml.patch new file mode 100644 index 000000000..92a5f524b --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-exporter.yaml.patch @@ -0,0 +1,178 @@ +--- charts-original/templates/prometheus/rules-1.14/node-exporter.yaml ++++ charts/templates/prometheus/rules-1.14/node-exporter.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'node-exporter' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/node-exporter-prometheusRule.yaml ++Generated from 'node-exporter' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/node-exporter-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -27,6 +27,7 @@ + - alert: NodeFilesystemSpaceFillingUp + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available space left and is filling up. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemspacefillingup + summary: Filesystem is predicted to run out of space within the next 24 hours. + expr: |- + ( +@@ -45,6 +46,7 @@ + - alert: NodeFilesystemSpaceFillingUp + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available space left and is filling up fast. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemspacefillingup + summary: Filesystem is predicted to run out of space within the next 4 hours. + expr: |- + ( +@@ -63,6 +65,7 @@ + - alert: NodeFilesystemAlmostOutOfSpace + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available space left. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemalmostoutofspace + summary: Filesystem has less than 5% space left. + expr: |- + ( +@@ -79,6 +82,7 @@ + - alert: NodeFilesystemAlmostOutOfSpace + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available space left. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemalmostoutofspace + summary: Filesystem has less than 3% space left. + expr: |- + ( +@@ -95,6 +99,7 @@ + - alert: NodeFilesystemFilesFillingUp + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available inodes left and is filling up. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemfilesfillingup + summary: Filesystem is predicted to run out of inodes within the next 24 hours. + expr: |- + ( +@@ -113,6 +118,7 @@ + - alert: NodeFilesystemFilesFillingUp + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available inodes left and is filling up fast. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemfilesfillingup + summary: Filesystem is predicted to run out of inodes within the next 4 hours. + expr: |- + ( +@@ -131,6 +137,7 @@ + - alert: NodeFilesystemAlmostOutOfFiles + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available inodes left. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemalmostoutoffiles + summary: Filesystem has less than 5% inodes left. + expr: |- + ( +@@ -147,6 +154,7 @@ + - alert: NodeFilesystemAlmostOutOfFiles + annotations: + description: Filesystem on {{`{{`}} $labels.device {{`}}`}} at {{`{{`}} $labels.instance {{`}}`}} has only {{`{{`}} printf "%.2f" $value {{`}}`}}% available inodes left. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefilesystemalmostoutoffiles + summary: Filesystem has less than 3% inodes left. + expr: |- + ( +@@ -163,6 +171,7 @@ + - alert: NodeNetworkReceiveErrs + annotations: + description: '{{`{{`}} $labels.instance {{`}}`}} interface {{`{{`}} $labels.device {{`}}`}} has encountered {{`{{`}} printf "%.0f" $value {{`}}`}} receive errors in the last two minutes.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodenetworkreceiveerrs + summary: Network interface is reporting many receive errors. + expr: rate(node_network_receive_errs_total[2m]) / rate(node_network_receive_packets_total[2m]) > 0.01 + for: 1h +@@ -174,6 +183,7 @@ + - alert: NodeNetworkTransmitErrs + annotations: + description: '{{`{{`}} $labels.instance {{`}}`}} interface {{`{{`}} $labels.device {{`}}`}} has encountered {{`{{`}} printf "%.0f" $value {{`}}`}} transmit errors in the last two minutes.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodenetworktransmiterrs + summary: Network interface is reporting many transmit errors. + expr: rate(node_network_transmit_errs_total[2m]) / rate(node_network_transmit_packets_total[2m]) > 0.01 + for: 1h +@@ -185,6 +195,7 @@ + - alert: NodeHighNumberConntrackEntriesUsed + annotations: + description: '{{`{{`}} $value | humanizePercentage {{`}}`}} of conntrack entries are used.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodehighnumberconntrackentriesused + summary: Number of conntrack are getting close to the limit. + expr: (node_nf_conntrack_entries / node_nf_conntrack_entries_limit) > 0.75 + labels: +@@ -195,6 +206,7 @@ + - alert: NodeTextFileCollectorScrapeError + annotations: + description: Node Exporter text file collector failed to scrape. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodetextfilecollectorscrapeerror + summary: Node Exporter text file collector failed to scrape. + expr: node_textfile_scrape_error{job="node-exporter"} == 1 + labels: +@@ -204,7 +216,8 @@ + {{- end }} + - alert: NodeClockSkewDetected + annotations: +- message: Clock on {{`{{`}} $labels.instance {{`}}`}} is out of sync by more than 300s. Ensure NTP is configured correctly on this host. ++ description: Clock on {{`{{`}} $labels.instance {{`}}`}} is out of sync by more than 300s. Ensure NTP is configured correctly on this host. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodeclockskewdetected + summary: Clock skew detected. + expr: |- + ( +@@ -226,7 +239,8 @@ + {{- end }} + - alert: NodeClockNotSynchronising + annotations: +- message: Clock on {{`{{`}} $labels.instance {{`}}`}} is not synchronising. Ensure NTP is configured on this host. ++ description: Clock on {{`{{`}} $labels.instance {{`}}`}} is not synchronising. Ensure NTP is configured on this host. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodeclocknotsynchronising + summary: Clock not synchronising. + expr: |- + min_over_time(node_timex_sync_status[5m]) == 0 +@@ -241,6 +255,7 @@ + - alert: NodeRAIDDegraded + annotations: + description: RAID array '{{`{{`}} $labels.device {{`}}`}}' on {{`{{`}} $labels.instance {{`}}`}} is in degraded state due to one or more disks failures. Number of spare drives is insufficient to fix issue automatically. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-noderaiddegraded + summary: RAID Array is degraded + expr: node_md_disks_required - ignoring (state) (node_md_disks{state="active"}) > 0 + for: 15m +@@ -252,11 +267,42 @@ + - alert: NodeRAIDDiskFailure + annotations: + description: At least one device in RAID array on {{`{{`}} $labels.instance {{`}}`}} failed. Array '{{`{{`}} $labels.device {{`}}`}}' needs attention and possibly a disk swap. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-noderaiddiskfailure + summary: Failed device in RAID array +- expr: node_md_disks{state="fail"} > 0 ++ expr: node_md_disks{state="failed"} > 0 + labels: + severity: warning + {{- if .Values.defaultRules.additionalRuleLabels }} + {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} ++ - alert: NodeFileDescriptorLimit ++ annotations: ++ description: File descriptors limit at {{`{{`}} $labels.instance {{`}}`}} is currently at {{`{{`}} printf "%.2f" $value {{`}}`}}%. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefiledescriptorlimit ++ summary: Kernel is predicted to exhaust file descriptors limit soon. ++ expr: |- ++ ( ++ node_filefd_allocated{job="node-exporter"} * 100 / node_filefd_maximum{job="node-exporter"} > 70 ++ ) ++ for: 15m ++ labels: ++ severity: warning ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: NodeFileDescriptorLimit ++ annotations: ++ description: File descriptors limit at {{`{{`}} $labels.instance {{`}}`}} is currently at {{`{{`}} printf "%.2f" $value {{`}}`}}%. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodefiledescriptorlimit ++ summary: Kernel is predicted to exhaust file descriptors limit soon. ++ expr: |- ++ ( ++ node_filefd_allocated{job="node-exporter"} * 100 / node_filefd_maximum{job="node-exporter"} > 90 ++ ) ++ for: 15m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} + {{- end }} +\ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-network.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-network.yaml.patch new file mode 100644 index 000000000..3c5a9aa41 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node-network.yaml.patch @@ -0,0 +1,20 @@ +--- charts-original/templates/prometheus/rules-1.14/node-network.yaml ++++ charts/templates/prometheus/rules-1.14/node-network.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'node-network' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'node-network' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kube-prometheus-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -26,7 +26,9 @@ + rules: + - alert: NodeNetworkInterfaceFlapping + annotations: +- message: Network interface "{{`{{`}} $labels.device {{`}}`}}" changing it's up status often on node-exporter {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod {{`}}`}}" ++ description: Network interface "{{`{{`}} $labels.device {{`}}`}}" changing it's up status often on node-exporter {{`{{`}} $labels.namespace {{`}}`}}/{{`{{`}} $labels.pod {{`}}`}} ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-nodenetworkinterfaceflapping ++ summary: Network interface is often changin it's status + expr: changes(node_network_up{job="node-exporter",device!~"veth.+"}[2m]) > 2 + for: 2m + labels: diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node.rules.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node.rules.yaml.patch new file mode 100644 index 000000000..3c4c734aa --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/node.rules.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/node.rules.yaml ++++ charts/templates/prometheus/rules-1.14/node.rules.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'node.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/kubernetes-prometheusRule.yaml ++Generated from 'node.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/kubernetes-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/prometheus-operator.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/prometheus-operator.yaml.patch new file mode 100644 index 000000000..4d030ce16 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/prometheus-operator.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/prometheus/rules-1.14/prometheus-operator.yaml ++++ charts/templates/prometheus/rules-1.14/prometheus-operator.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/prometheus-operator-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/prometheus.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/prometheus.yaml.patch new file mode 100644 index 000000000..624539873 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/prometheus.yaml.patch @@ -0,0 +1,231 @@ +--- charts-original/templates/prometheus/rules-1.14/prometheus.yaml ++++ charts/templates/prometheus/rules-1.14/prometheus.yaml +@@ -1,5 +1,5 @@ + {{- /* +-Generated from 'prometheus' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml ++Generated from 'prometheus' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/main/manifests/prometheus-prometheusRule.yaml + Do not change in-place! In order to change this file first read following link: + https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack + */ -}} +@@ -29,6 +29,7 @@ + - alert: PrometheusBadConfig + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has failed to reload its configuration. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusbadconfig + summary: Failed Prometheus configuration reload. + expr: |- + # Without max_over_time, failed scrapes could create false negatives, see +@@ -43,6 +44,7 @@ + - alert: PrometheusNotificationQueueRunningFull + annotations: + description: Alert notification queue of Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} is running full. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusnotificationqueuerunningfull + summary: Prometheus alert notification queue predicted to run full in less than 30m. + expr: |- + # Without min_over_time, failed scrapes could create false negatives, see +@@ -61,6 +63,7 @@ + - alert: PrometheusErrorSendingAlertsToSomeAlertmanagers + annotations: + description: '{{`{{`}} printf "%.1f" $value {{`}}`}}% errors while sending alerts from Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} to Alertmanager {{`{{`}}$labels.alertmanager{{`}}`}}.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheuserrorsendingalertstosomealertmanagers + summary: Prometheus has encountered more than 1% errors sending alerts to a specific Alertmanager. + expr: |- + ( +@@ -76,27 +79,10 @@ + {{- if .Values.defaultRules.additionalRuleLabels }} + {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} +- - alert: PrometheusErrorSendingAlertsToAnyAlertmanager +- annotations: +- description: '{{`{{`}} printf "%.1f" $value {{`}}`}}% minimum errors while sending alerts from Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} to any Alertmanager.' +- summary: Prometheus encounters more than 3% errors sending alerts to any Alertmanager. +- expr: |- +- min without(alertmanager) ( +- rate(prometheus_notifications_errors_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) +- / +- rate(prometheus_notifications_sent_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) +- ) +- * 100 +- > 3 +- for: 15m +- labels: +- severity: critical +-{{- if .Values.defaultRules.additionalRuleLabels }} +-{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} +-{{- end }} + - alert: PrometheusNotConnectedToAlertmanagers + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} is not connected to any Alertmanagers. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusnotconnectedtoalertmanagers + summary: Prometheus is not connected to any Alertmanagers. + expr: |- + # Without max_over_time, failed scrapes could create false negatives, see +@@ -111,6 +97,7 @@ + - alert: PrometheusTSDBReloadsFailing + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has detected {{`{{`}}$value | humanize{{`}}`}} reload failures over the last 3h. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheustsdbreloadsfailing + summary: Prometheus has issues reloading blocks from disk. + expr: increase(prometheus_tsdb_reloads_failures_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[3h]) > 0 + for: 4h +@@ -122,6 +109,7 @@ + - alert: PrometheusTSDBCompactionsFailing + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has detected {{`{{`}}$value | humanize{{`}}`}} compaction failures over the last 3h. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheustsdbcompactionsfailing + summary: Prometheus has issues compacting blocks. + expr: increase(prometheus_tsdb_compactions_failed_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[3h]) > 0 + for: 4h +@@ -133,8 +121,18 @@ + - alert: PrometheusNotIngestingSamples + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} is not ingesting samples. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusnotingestingsamples + summary: Prometheus is not ingesting samples. +- expr: rate(prometheus_tsdb_head_samples_appended_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) <= 0 ++ expr: |- ++ ( ++ rate(prometheus_tsdb_head_samples_appended_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) <= 0 ++ and ++ ( ++ sum without(scrape_job) (prometheus_target_metadata_cache_entries{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}) > 0 ++ or ++ sum without(rule_group) (prometheus_rule_group_rules{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}) > 0 ++ ) ++ ) + for: 10m + labels: + severity: warning +@@ -144,6 +142,7 @@ + - alert: PrometheusDuplicateTimestamps + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} is dropping {{`{{`}} printf "%.4g" $value {{`}}`}} samples/s with different values but duplicated timestamp. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusduplicatetimestamps + summary: Prometheus is dropping samples with duplicate timestamps. + expr: rate(prometheus_target_scrapes_sample_duplicate_timestamp_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) > 0 + for: 10m +@@ -155,6 +154,7 @@ + - alert: PrometheusOutOfOrderTimestamps + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} is dropping {{`{{`}} printf "%.4g" $value {{`}}`}} samples/s with timestamps arriving out of order. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusoutofordertimestamps + summary: Prometheus drops samples with out-of-order timestamps. + expr: rate(prometheus_target_scrapes_sample_out_of_order_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) > 0 + for: 10m +@@ -166,15 +166,16 @@ + - alert: PrometheusRemoteStorageFailures + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} failed to send {{`{{`}} printf "%.1f" $value {{`}}`}}% of the samples to {{`{{`}} $labels.remote_name{{`}}`}}:{{`{{`}} $labels.url {{`}}`}} ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusremotestoragefailures + summary: Prometheus fails to send samples to remote storage. + expr: |- + ( +- rate(prometheus_remote_storage_failed_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) ++ (rate(prometheus_remote_storage_failed_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) or rate(prometheus_remote_storage_samples_failed_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m])) + / + ( +- rate(prometheus_remote_storage_failed_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) ++ (rate(prometheus_remote_storage_failed_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) or rate(prometheus_remote_storage_samples_failed_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m])) + + +- rate(prometheus_remote_storage_succeeded_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) ++ (rate(prometheus_remote_storage_succeeded_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) or rate(prometheus_remote_storage_samples_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m])) + ) + ) + * 100 +@@ -188,13 +189,14 @@ + - alert: PrometheusRemoteWriteBehind + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} remote write is {{`{{`}} printf "%.1f" $value {{`}}`}}s behind for {{`{{`}} $labels.remote_name{{`}}`}}:{{`{{`}} $labels.url {{`}}`}}. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusremotewritebehind + summary: Prometheus remote write is behind. + expr: |- + # Without max_over_time, failed scrapes could create false negatives, see + # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details. + ( + max_over_time(prometheus_remote_storage_highest_timestamp_in_seconds{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) +- - on(job, instance) group_right ++ - ignoring(remote_name, url) group_right + max_over_time(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) + ) + > 120 +@@ -207,6 +209,7 @@ + - alert: PrometheusRemoteWriteDesiredShards + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} remote write desired shards calculation wants to run {{`{{`}} $value {{`}}`}} shards for queue {{`{{`}} $labels.remote_name{{`}}`}}:{{`{{`}} $labels.url {{`}}`}}, which is more than the max of {{`{{`}} printf `prometheus_remote_storage_shards_max{instance="%s",job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}` $labels.instance | query | first | value {{`}}`}}. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusremotewritedesiredshards + summary: Prometheus remote write desired shards calculation wants to run more than configured max shards. + expr: |- + # Without max_over_time, failed scrapes could create false negatives, see +@@ -225,6 +228,7 @@ + - alert: PrometheusRuleFailures + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has failed to evaluate {{`{{`}} printf "%.0f" $value {{`}}`}} rules in the last 5m. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusrulefailures + summary: Prometheus is failing rule evaluations. + expr: increase(prometheus_rule_evaluation_failures_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) > 0 + for: 15m +@@ -236,6 +240,7 @@ + - alert: PrometheusMissingRuleEvaluations + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has missed {{`{{`}} printf "%.0f" $value {{`}}`}} rule group evaluations in the last 5m. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheusmissingruleevaluations + summary: Prometheus is missing rule evaluations due to slow rule group evaluation. + expr: increase(prometheus_rule_group_iterations_missed_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) > 0 + for: 15m +@@ -247,6 +252,7 @@ + - alert: PrometheusTargetLimitHit + annotations: + description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has dropped {{`{{`}} printf "%.0f" $value {{`}}`}} targets because the number of targets exceeded the configured target_limit. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheustargetlimithit + summary: Prometheus has dropped targets because some scrape configs have exceeded the targets limit. + expr: increase(prometheus_target_scrape_pool_exceeded_target_limit_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) > 0 + for: 15m +@@ -255,4 +261,47 @@ + {{- if .Values.defaultRules.additionalRuleLabels }} + {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} ++ - alert: PrometheusLabelLimitHit ++ annotations: ++ description: Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} has dropped {{`{{`}} printf "%.0f" $value {{`}}`}} targets because some samples exceeded the configured label_limit, label_name_length_limit or label_value_length_limit. ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheuslabellimithit ++ summary: Prometheus has dropped targets because some scrape configs have exceeded the labels limit. ++ expr: increase(prometheus_target_scrape_pool_exceeded_label_limits_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[5m]) > 0 ++ for: 15m ++ labels: ++ severity: warning ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: PrometheusTargetSyncFailure ++ annotations: ++ description: '{{`{{`}} printf "%.0f" $value {{`}}`}} targets in Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} have failed to sync because invalid configuration was supplied.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheustargetsyncfailure ++ summary: Prometheus has failed to sync targets. ++ expr: increase(prometheus_target_sync_failed_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}"}[30m]) > 0 ++ for: 5m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} ++ - alert: PrometheusErrorSendingAlertsToAnyAlertmanager ++ annotations: ++ description: '{{`{{`}} printf "%.1f" $value {{`}}`}}% minimum errors while sending alerts from Prometheus {{`{{`}}$labels.namespace{{`}}`}}/{{`{{`}}$labels.pod{{`}}`}} to any Alertmanager.' ++ runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-prometheuserrorsendingalertstoanyalertmanager ++ summary: Prometheus encounters more than 3% errors sending alerts to any Alertmanager. ++ expr: |- ++ min without (alertmanager) ( ++ rate(prometheus_notifications_errors_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}",alertmanager!~``}[5m]) ++ / ++ rate(prometheus_notifications_sent_total{job="{{ $prometheusJob }}",namespace="{{ $namespace }}",alertmanager!~``}[5m]) ++ ) ++ * 100 ++ > 3 ++ for: 15m ++ labels: ++ severity: critical ++{{- if .Values.defaultRules.additionalRuleLabels }} ++{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} ++{{- end }} + {{- end }} +\ No newline at end of file diff --git a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch index 62f839a48..e10616b1c 100644 --- a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch @@ -756,7 +756,18 @@ ## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## -@@ -1266,6 +1857,13 @@ +@@ -1258,6 +1849,10 @@ + # replacement: $1 + # action: replace + ++ # Enable self metrics configuration for Service Monitor ++ selfMonitor: ++ enabled: false ++ + ## Configuration for kube-state-metrics subchart + ## + kube-state-metrics: +@@ -1266,6 +1861,13 @@ create: true podSecurityPolicy: enabled: true @@ -770,7 +781,7 @@ ## Deploy node exporter as a daemonset to all nodes ## -@@ -1319,6 +1917,16 @@ +@@ -1319,6 +1921,16 @@ extraArgs: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/) - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ @@ -787,7 +798,7 @@ ## Manages Prometheus and Alertmanager components ## -@@ -1331,8 +1939,8 @@ +@@ -1331,8 +1943,8 @@ enabled: true # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants tlsMinVersion: VersionTLS13 @@ -798,7 +809,7 @@ ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted ## rules from making their way into prometheus and potentially preventing the container from starting -@@ -1349,7 +1957,7 @@ +@@ -1349,7 +1961,7 @@ patch: enabled: true image: @@ -807,7 +818,7 @@ tag: v1.5.2 sha: "" pullPolicy: IfNotPresent -@@ -1498,13 +2106,13 @@ +@@ -1498,13 +2110,13 @@ ## Resource limits & requests ## @@ -828,25 +839,43 @@ # Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico), # because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working -@@ -1557,7 +2165,7 @@ +@@ -1557,8 +2169,8 @@ ## Prometheus-operator image ## image: - repository: quay.io/prometheus-operator/prometheus-operator +- tag: v0.48.0 + repository: rancher/mirrored-prometheus-operator-prometheus-operator - tag: v0.48.0 ++ tag: v0.49.0 sha: "" pullPolicy: IfNotPresent -@@ -1573,7 +2181,7 @@ + +@@ -1573,8 +2185,8 @@ ## Prometheus-config-reloader image to use for config and rule reloading ## prometheusConfigReloaderImage: - repository: quay.io/prometheus-operator/prometheus-config-reloader +- tag: v0.48.0 + repository: rancher/mirrored-prometheus-operator-prometheus-config-reloader - tag: v0.48.0 ++ tag: v0.49.0 sha: "" -@@ -1659,7 +2267,7 @@ + ## Set the prometheus config reloader side-car CPU limit +@@ -1585,6 +2197,13 @@ + ## + configReloaderMemory: 50Mi + ++ ## Thanos side-car image when configured ++ ## ++ thanosImage: ++ repository: quay.io/thanos/thanos ++ tag: v0.17.2 ++ sha: "" ++ + ## Set a Field Selector to filter watched secrets + ## + secretFieldSelector: "" +@@ -1659,7 +2278,7 @@ port: 9090 ## To be used with a proxy extraContainer port @@ -855,16 +884,18 @@ ## List of IP addresses at which the Prometheus server service is available ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips -@@ -1916,7 +2524,7 @@ +@@ -1916,8 +2535,8 @@ ## Image of Prometheus. ## image: - repository: quay.io/prometheus/prometheus +- tag: v2.27.1 + repository: rancher/mirrored-prometheus-prometheus - tag: v2.27.1 ++ tag: v2.28.1 sha: "" -@@ -1979,6 +2587,11 @@ + ## Tolerations for use with node taints +@@ -1979,6 +2598,11 @@ ## externalUrl: "" @@ -876,7 +907,7 @@ ## Define which Nodes the Pods are scheduled on. ## ref: https://kubernetes.io/docs/user-guide/node-selection/ ## -@@ -2011,7 +2624,7 @@ +@@ -2011,7 +2635,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the PrometheusRule resources created ## @@ -885,7 +916,7 @@ ## PrometheusRules to be selected for target discovery. ## If {}, select all PrometheusRules -@@ -2036,7 +2649,7 @@ +@@ -2036,7 +2660,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the servicemonitors created ## @@ -894,7 +925,7 @@ ## ServiceMonitors to be selected for target discovery. ## If {}, select all ServiceMonitors -@@ -2059,7 +2672,7 @@ +@@ -2059,7 +2683,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the podmonitors created ## @@ -903,7 +934,7 @@ ## PodMonitors to be selected for target discovery. ## If {}, select all PodMonitors -@@ -2190,9 +2803,13 @@ +@@ -2190,9 +2814,13 @@ ## Resource limits & requests ## @@ -920,7 +951,7 @@ ## Prometheus StorageSpec for persistent data ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md -@@ -2215,7 +2832,13 @@ +@@ -2215,7 +2843,13 @@ # medium: Memory # Additional volumes on the output StatefulSet definition. @@ -935,7 +966,22 @@ # Additional VolumeMounts on the output StatefulSet definition. volumeMounts: [] -@@ -2322,9 +2945,34 @@ +@@ -2288,6 +2922,14 @@ + # services: + # - metrics-prometheus-alertmanager + ++ ## If additional alertmanager configurations are already deployed in a single secret, or you want to manage ++ ## them separately from the helm deployment, you can use this section. ++ ## Expected values are the secret name and key ++ ## Cannot be used with additionalAlertManagerConfigs ++ additionalAlertManagerConfigsSecret: {} ++ # name: ++ # key: ++ + ## AdditionalAlertRelabelConfigs allows specifying Prometheus alert relabel configurations. Alert relabel configurations specified are appended + ## to the configurations generated by the Prometheus Operator. Alert relabel configurations specified must have the form as specified in the + ## official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs. +@@ -2322,9 +2964,34 @@ ## thanos: {} @@ -971,7 +1017,7 @@ ## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes ## (permissions, dir tree) on mounted volumes before starting prometheus -@@ -2332,7 +2980,7 @@ +@@ -2332,7 +2999,7 @@ ## PortName to use for Prometheus. ##