Merge pull request #2968 from czeslavo/1.18-bump-prom-operator-types

[v1.18] Update prometheus-operator types to a pre-v0.86.0 commit (6958a7c)

Author: scylla-operator-bot[bot]

pkg/externalapi/monitoring/v1/alertmanager_types.go

@@ -18,14 +18,14 @@ package v1
 type PodDNSConfig struct {
 	// A list of DNS name server IP addresses.
 	// This will be appended to the base nameservers generated from DNSPolicy.
-	// +kubebuilder:validation:Optional
+	// +optional
 	// +listType:=set
 	// +kubebuilder:validation:items:MinLength:=1
 	Nameservers []string `json:"nameservers,omitempty"`
 
 	// A list of DNS search domains for host-name lookup.
 	// This will be appended to the base search paths generated from DNSPolicy.
-	// +kubebuilder:validation:Optional
+	// +optional
 	// +listType:=set
 	// +kubebuilder:validation:items:MinLength:=1
 	Searches []string `json:"searches,omitempty"`
@@ -34,7 +34,7 @@ type PodDNSConfig struct {
 	// This will be merged with the base options generated from DNSPolicy.
 	// Resolution options given in Options
 	// will override those that appear in the base DNSPolicy.
-	// +kubebuilder:validation:Optional
+	// +optional
 	// +listType=map
 	// +listMapKey=name
 	Options []PodDNSConfigOption `json:"options,omitempty"`
@@ -44,10 +44,11 @@ type PodDNSConfig struct {
 type PodDNSConfigOption struct {
 	// Name is required and must be unique.
 	// +kubebuilder:validation:MinLength=1
+	// +required
 	Name string `json:"name"`
 
 	// Value is optional.
-	// +kubebuilder:validation:Optional
+	// +optional
 	Value *string `json:"value,omitempty"`
 }
 

pkg/externalapi/monitoring/v1/dns_types.go

@@ -4143,6 +4143,15 @@ spec:
                   x-kubernetes-list-map-keys:
                     - ip
                   x-kubernetes-list-type: map
+                hostUsers:
+                  description: |-
+                    HostUsers supports the user space in Kubernetes.
+
+                    More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                    The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                    Starting Kubernetes 1.33, the feature is enabled by default.
+                  type: boolean
                 image:
                   description: |-
                     Image if specified has precedence over baseImage, tag and sha
@@ -5607,9 +5616,10 @@ spec:
                   description: |-
                     Minimum number of seconds for which a newly created pod should be ready
                     without any of its container crashing for it to be considered available.
-                    Defaults to 0 (pod will be considered available as soon as it is ready)
-                    This is an alpha field from kubernetes 1.22 until 1.24 which requires enabling the StatefulSetMinReadySeconds feature gate.
+
+                    If unset, pods will be considered available as soon as they are ready.
                   format: int32
+                  minimum: 0
                   type: integer
                 nodeSelector:
                   additionalProperties:
@@ -5619,7 +5629,7 @@ spec:
                 paused:
                   description: |-
                     If set to true all actions on the underlying managed objects are not
-                    goint to be performed, except for delete actions.
+                    going to be performed, except for delete actions.
                   type: boolean
                 persistentVolumeClaimRetentionPolicy:
                   description: |-

pkg/externalapi/monitoring/v1/monitoring.coreos.com_alertmanagers.yaml

@@ -1101,6 +1101,8 @@ spec:
                   description: |-
                     Whether to scrape a classic histogram that is also exposed as a native histogram.
                     It requires Prometheus >= v2.45.0.
+
+                    Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
                   type: boolean
                 scrapeProtocols:
                   description: |-

pkg/externalapi/monitoring/v1/monitoring.coreos.com_podmonitors.yaml

@@ -623,6 +623,33 @@ spec:
                     - clientSecret
                     - tokenUrl
                   type: object
+                params:
+                  description: |-
+                    The list of HTTP query parameters for the scrape.
+                    Please note that the `.spec.module` field takes precedence over the `module` parameter from this list when both are defined.
+                    The module name must be added using Module under ProbeSpec.
+                  items:
+                    description: ProbeParam defines specification of extra parameters for a Probe.
+                    properties:
+                      name:
+                        description: The parameter name
+                        minLength: 1
+                        type: string
+                      values:
+                        description: The parameter values
+                        items:
+                          minLength: 1
+                          type: string
+                        minItems: 1
+                        type: array
+                    required:
+                      - name
+                    type: object
+                  minItems: 1
+                  type: array
+                  x-kubernetes-list-map-keys:
+                    - name
+                  x-kubernetes-list-type: map
                 prober:
                   description: |-
                     Specification for the prober to use for probing targets.
@@ -711,6 +738,8 @@ spec:
                   description: |-
                     Whether to scrape a classic histogram that is also exposed as a native histogram.
                     It requires Prometheus >= v2.45.0.
+
+                    Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
                   type: boolean
                 scrapeProtocols:
                   description: |-

pkg/externalapi/monitoring/v1/monitoring.coreos.com_probes.yaml

@@ -3825,6 +3825,15 @@ spec:
                     `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set
                     to a different value).
                   type: boolean
+                hostUsers:
+                  description: |-
+                    HostUsers supports the user space in Kubernetes.
+
+                    More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                    The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                    Starting Kubernetes 1.33, the feature is enabled by default.
+                  type: boolean
                 ignoreNamespaceSelectors:
                   description: |-
                     When true, `spec.namespaceSelector` from all PodMonitor, ServiceMonitor
@@ -5332,11 +5341,10 @@ spec:
                   description: |-
                     Minimum number of seconds for which a newly created Pod should be ready
                     without any of its container crashing for it to be considered available.
-                    Defaults to 0 (pod will be considered available as soon as it is ready)
 
-                    This is an alpha field from kubernetes 1.22 until 1.24 which requires
-                    enabling the StatefulSetMinReadySeconds feature gate.
+                    If unset, pods will be considered available as soon as they are ready.
                   format: int32
+                  minimum: 0
                   type: integer
                 nameEscapingScheme:
                   description: |-
@@ -5375,15 +5383,36 @@ spec:
                         Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
                         It requires Prometheus >= v3.4.0.
                       type: boolean
+                    ignoreResourceAttributes:
+                      description: |-
+                        List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.
+
+                        It requires `promoteAllResourceAttributes` to be true.
+                        It requires Prometheus >= v3.5.0.
+                      items:
+                        minLength: 1
+                        type: string
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-type: set
                     keepIdentifyingResourceAttributes:
                       description: |-
                         Enables adding `service.name`, `service.namespace` and `service.instance.id`
                         resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
 
                         It requires Prometheus >= v3.1.0.
                       type: boolean
+                    promoteAllResourceAttributes:
+                      description: |-
+                        Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.
+
+                        Cannot be true when `promoteResourceAttributes` is defined.
+                        It requires Prometheus >= v3.5.0.
+                      type: boolean
                     promoteResourceAttributes:
-                      description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
+                      description: |-
+                        List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
+                        Cannot be defined when `promoteAllResourceAttributes` is true.
                       items:
                         minLength: 1
                         type: string
@@ -8182,6 +8211,9 @@ spec:
                 scrapeClassicHistograms:
                   description: |-
                     Whether to scrape a classic histogram that is also exposed as a native histogram.
+
+                    Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
+
                     It requires Prometheus >= v3.5.0.
                   type: boolean
                 scrapeConfigNamespaceSelector:

pkg/externalapi/monitoring/v1/monitoring.coreos.com_prometheuses.yaml

@@ -1113,6 +1113,8 @@ spec:
                   description: |-
                     Whether to scrape a classic histogram that is also exposed as a native histogram.
                     It requires Prometheus >= v2.45.0.
+
+                    Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
                   type: boolean
                 scrapeProtocols:
                   description: |-
@@ -1297,6 +1299,12 @@ spec:
                       - resource
                     type: object
                   type: array
+                  x-kubernetes-list-map-keys:
+                    - group
+                    - resource
+                    - name
+                    - namespace
+                  x-kubernetes-list-type: map
               type: object
           required:
             - spec

pkg/externalapi/monitoring/v1/monitoring.coreos.com_servicemonitors.yaml

@@ -2504,6 +2504,22 @@ spec:
                     - Default
                     - None
                   type: string
+                enableFeatures:
+                  description: |-
+                    Enable access to Thanos Ruler feature flags. By default, no features are enabled.
+
+                    Enabling features which are disabled by default 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://thanos.io/tip/components/rule.md/
+
+                    It requires Thanos >= 0.39.0.
+                  items:
+                    minLength: 1
+                    type: string
+                  type: array
+                  x-kubernetes-list-type: set
                 enableServiceLinks:
                   description: Indicates whether information about services should be injected into pod's environment variables
                   type: boolean
@@ -2747,6 +2763,15 @@ spec:
                   x-kubernetes-list-map-keys:
                     - ip
                   x-kubernetes-list-type: map
+                hostUsers:
+                  description: |-
+                    HostUsers supports the user space in Kubernetes.
+
+                    More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                    The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                    Starting Kubernetes 1.33, the feature is enabled by default.
+                  type: boolean
                 image:
                   description: Thanos container image URL.
                   type: string
@@ -4194,9 +4219,10 @@ spec:
                   description: |-
                     Minimum number of seconds for which a newly created pod should be ready
                     without any of its container crashing for it to be considered available.
-                    Defaults to 0 (pod will be considered available as soon as it is ready)
-                    This is an alpha field from kubernetes 1.22 until 1.24 which requires enabling the StatefulSetMinReadySeconds feature gate.
+
+                    If unset, pods will be considered available as soon as they are ready.
                   format: int32
+                  minimum: 0
                   type: integer
                 nodeSelector:
                   additionalProperties:
@@ -5383,6 +5409,10 @@ spec:
                   description: Number of thanos ruler instances to deploy.
                   format: int32
                   type: integer
+                resendDelay:
+                  description: Minimum amount of time to wait before resending an alert to Alertmanager.
+                  pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                  type: string
                 resources:
                   description: |-
                     Resources defines the resource requirements for single Pods.
@@ -5465,6 +5495,13 @@ spec:
                   format: int32
                   minimum: 1
                   type: integer
+                ruleGracePeriod:
+                  description: |-
+                    Minimum duration between alert and restored "for" state.
+                    This is maintained only for alerts with configured "for" time greater than grace period.
+                    It requires Thanos >= v0.30.0.
+                  pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                  type: string
                 ruleNamespaceSelector:
                   description: |-
                     Namespaces to be selected for Rules discovery. If unspecified, only

pkg/externalapi/monitoring/v1/monitoring.coreos.com_thanosrulers.yaml

@@ -40,9 +40,11 @@ const (
 //
 // `Prometheus` and `PrometheusAgent` objects select `PodMonitor` objects using label and namespace selectors.
 type PodMonitor struct {
-	metav1.TypeMeta   `json:",inline"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 	// Specification of desired Pod selection for target discovery by Prometheus.
+	// +required
 	Spec PodMonitorSpec `json:"spec"`
 }
 
@@ -64,11 +66,13 @@ type PodMonitorSpec struct {
 	//
 	// If the value of this field is empty, the `job` label of the metrics
 	// defaults to the namespace and name of the PodMonitor object (e.g. `<namespace>/<name>`).
+	// +optional
 	JobLabel string `json:"jobLabel,omitempty"`
 
 	// `podTargetLabels` defines the labels which are transferred from the
 	// associated Kubernetes `Pod` object onto the ingested metrics.
 	//
+	// +optional
 	PodTargetLabels []string `json:"podTargetLabels,omitempty"`
 
 	// Defines how to scrape metrics from the selected pods.
@@ -77,6 +81,7 @@ type PodMonitorSpec struct {
 	PodMetricsEndpoints []PodMetricsEndpoint `json:"podMetricsEndpoints"`
 
 	// Label selector to select the Kubernetes `Pod` objects to scrape metrics from.
+	// +required
 	Selector metav1.LabelSelector `json:"selector"`
 
 	// Mechanism used to select the endpoints to scrape.
@@ -91,6 +96,7 @@ type PodMonitorSpec struct {
 
 	// `namespaceSelector` defines in which namespace(s) Prometheus should discover the pods.
 	// By default, the pods are discovered in the same namespace as the `PodMonitor` object but it is possible to select pods across different/all namespaces.
+	// +optional
 	NamespaceSelector NamespaceSelector `json:"namespaceSelector,omitempty"`
 
 	// `sampleLimit` defines a per-scrape limit on the number of scraped samples
@@ -210,11 +216,13 @@ type PodMetricsEndpoint struct {
 	// port must be specified with container port property.
 	//
 	// Deprecated: use 'port' or 'portNumber' instead.
+	// +optional
 	TargetPort *apimachineryutilintstr.IntOrString `json:"targetPort,omitempty"`
 
 	// HTTP path from which to scrape for metrics.
 	//
 	// If empty, Prometheus uses the default value (e.g. `/metrics`).
+	// +optional
 	Path string `json:"path,omitempty"`
 
 	// HTTP scheme to use for scraping.
@@ -225,21 +233,25 @@ type PodMetricsEndpoint struct {
 	// If empty, Prometheus uses the default value `http`.
 	//
 	// +kubebuilder:validation:Enum=http;https
+	// +optional
 	Scheme string `json:"scheme,omitempty"`
 
 	// `params` define optional HTTP URL parameters.
+	// +optional
 	Params map[string][]string `json:"params,omitempty"`
 
 	// Interval at which Prometheus scrapes the metrics from the target.
 	//
 	// If empty, Prometheus uses the global scrape interval.
+	// +optional
 	Interval Duration `json:"interval,omitempty"`
 
 	// Timeout after which Prometheus considers the scrape to be failed.
 	//
 	// If empty, Prometheus uses the global scrape timeout unless it is less
 	// than the target's scrape interval value in which the latter is used.
 	// The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
+	// +optional
 	ScrapeTimeout Duration `json:"scrapeTimeout,omitempty"`
 
 	// TLS configuration to use when scraping the target.
@@ -258,6 +270,7 @@ type PodMetricsEndpoint struct {
 
 	// When true, `honorLabels` preserves the metric's labels when they collide
 	// with the target's labels.
+	// +optional
 	HonorLabels bool `json:"honorLabels,omitempty"`
 
 	// `honorTimestamps` controls whether Prometheus preserves the timestamps