[prometheus-operator-crds] bump crds to 0.68.0 (#3771)

prometheus-community · Sep 11, 2023 · 33bf16a · 33bf16a
1 parent d612180
commit 33bf16a
Show file tree

Hide file tree

Showing 16 changed files with 1,127 additions and 249 deletions.
diff --git a/charts/prometheus-operator-crds/.gitignore b/charts/prometheus-operator-crds/.gitignore
@@ -0,0 +1,4 @@
+!charts/crds/
+!charts/crds/**
+!charts/crds/templates/
+!charts/crds/templates/**
diff --git a/charts/prometheus-operator-crds/Chart.yaml b/charts/prometheus-operator-crds/Chart.yaml
@@ -1,27 +1,27 @@
 apiVersion: v2
 type: application
-version: 5.1.0
+version: 6.0.0
 name: prometheus-operator-crds
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
 description: |
   A Helm chart that collects custom resource definitions (CRDs) from the Prometheus Operator, allowing for seamless
   integration with GitOps tools
 keywords:
-- prometheus
-- crds
-appVersion: 0.67.0
+  - prometheus
+  - crds
+appVersion: v0.68.0
 kubeVersion: ">=1.16.0-0"
 sources:
-- https://github.com/prometheus-community/helm-charts
+  - https://github.com/prometheus-community/helm-charts
 maintainers:
-- name: dacamposol
-  email: [email protected]
-- name: desaintmartin
-  email: [email protected]
-- name: QuentinBisson
-  email: [email protected]
-- name: jkroepke
-  email: [email protected]
+  - name: dacamposol
+    email: [email protected]
+  - name: desaintmartin
+    email: [email protected]
+  - name: QuentinBisson
+    email: [email protected]
+  - name: jkroepke
+    email: [email protected]
 annotations:
   artifacthub.io/links: |
     - name: Chart Source
@@ -33,3 +33,7 @@ annotations:
       email: [email protected]
     - name: QuentinBisson
       email: [email protected]
+
+dependencies:
+  - name: crds
+    version: "0.0.0"
diff --git a/charts/prometheus-operator-crds/README.md b/charts/prometheus-operator-crds/README.md
@@ -48,6 +48,12 @@ helm upgrade [RELEASE_NAME] [CHART] --install
 
 _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
 
+## Upgrading to v6.0.0
+
+The upgraded chart now the following changes:
+
+- `annotations` value has moved to `crds.annotations`
+
 ## Configuring
 
 See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:

diff --git a/charts/prometheus-operator-crds/charts/crds/Chart.yaml b/charts/prometheus-operator-crds/charts/crds/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: crds
+version: 0.0.0
diff --git a/...ds/templates/crd-alertmanagerconfigs.yaml → ...ds/templates/crd-alertmanagerconfigs.yaml b/...ds/templates/crd-alertmanagerconfigs.yaml → ...ds/templates/crd-alertmanagerconfigs.yaml
diff --git a/...tor-crds/templates/crd-alertmanagers.yaml → ...rts/crds/templates/crd-alertmanagers.yaml b/...tor-crds/templates/crd-alertmanagers.yaml → ...rts/crds/templates/crd-alertmanagers.yaml
diff --git a/...rator-crds/templates/crd-podmonitors.yaml → ...harts/crds/templates/crd-podmonitors.yaml b/...rator-crds/templates/crd-podmonitors.yaml → ...harts/crds/templates/crd-podmonitors.yaml
@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -56,6 +56,12 @@ spec:
               jobLabel:
                 description: The label to use to retrieve the job name from.
                 type: string
+              keepDroppedTargets:
+                description: "Per-scrape limit on the number of targets dropped by
+                  relabeling that will be kept in memory. 0 means no limit. \n It
+                  requires Prometheus >= v2.47.0."
+                format: int64
+                type: integer
               labelLimit:
                 description: Per-scrape limit on number of labels that will be accepted
                   for a sample. Only valid in Prometheus versions 2.27.0 and newer.

diff --git a/...s-operator-crds/templates/crd-probes.yaml → ...rds/charts/crds/templates/crd-probes.yaml b/...s-operator-crds/templates/crd-probes.yaml → ...rds/charts/crds/templates/crd-probes.yaml
@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -145,6 +145,12 @@ spec:
               jobName:
                 description: The job name assigned to scraped metrics by default.
                 type: string
+              keepDroppedTargets:
+                description: "Per-scrape limit on the number of targets dropped by
+                  relabeling that will be kept in memory. 0 means no limit. \n It
+                  requires Prometheus >= v2.47.0."
+                format: int64
+                type: integer
               labelLimit:
                 description: Per-scrape limit on number of labels that will be accepted
                   for a sample. Only valid in Prometheus versions 2.27.0 and newer.

diff --git a/...-crds/templates/crd-prometheusagents.yaml → .../crds/templates/crd-prometheusagents.yaml b/...-crds/templates/crd-prometheusagents.yaml → .../crds/templates/crd-prometheusagents.yaml
diff --git a/...ator-crds/templates/crd-prometheuses.yaml → ...arts/crds/templates/crd-prometheuses.yaml b/...ator-crds/templates/crd-prometheuses.yaml → ...arts/crds/templates/crd-prometheuses.yaml
diff --git a/...r-crds/templates/crd-prometheusrules.yaml → ...s/crds/templates/crd-prometheusrules.yaml b/...r-crds/templates/crd-prometheusrules.yaml → ...s/crds/templates/crd-prometheusrules.yaml
@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/...tor-crds/templates/crd-scrapeconfigs.yaml → ...rts/crds/templates/crd-scrapeconfigs.yaml b/...tor-crds/templates/crd-scrapeconfigs.yaml → ...rts/crds/templates/crd-scrapeconfigs.yaml
@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -529,6 +529,44 @@ spec:
                   - server
                   type: object
                 type: array
+              dnsSDConfigs:
+                description: DNSSDConfigs defines a list of DNS service discovery
+                  configurations.
+                items:
+                  description: DNSSDConfig allows specifying a set of DNS domain names
+                    which are periodically queried to discover a list of targets.
+                    The DNS servers to be contacted are read from /etc/resolv.conf.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#dns_sd_config
+                  properties:
+                    names:
+                      description: A list of DNS domain names to be queried.
+                      items:
+                        type: string
+                      minItems: 1
+                      type: array
+                    port:
+                      description: The port number used if the query type is not SRV
+                        Ignored for SRV records
+                      type: integer
+                    refreshInterval:
+                      description: RefreshInterval configures the time after which
+                        the provided names are refreshed. If not set, Prometheus uses
+                        its default value.
+                      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
+                    type:
+                      description: The type of DNS query to perform. One of SRV, A,
+                        AAAA or MX. If not set, Prometheus uses its default value.
+                      enum:
+                      - SRV
+                      - A
+                      - AAAA
+                      - MX
+                      type: string
+                  required:
+                  - names
+                  type: object
+                type: array
               fileSDConfigs:
                 description: FileSDConfigs defines a list of file service discovery
                   configurations.
@@ -781,6 +819,12 @@ spec:
                   - url
                   type: object
                 type: array
+              keepDroppedTargets:
+                description: "Per-scrape limit on the number of targets dropped by
+                  relabeling that will be kept in memory. 0 means no limit. \n It
+                  requires Prometheus >= v2.47.0."
+                format: int64
+                type: integer
               kubernetesSDConfigs:
                 description: KubernetesSDConfigs defines a list of Kubernetes service
                   discovery configurations.
@@ -815,6 +859,78 @@ spec:
                   and newer.
                 format: int64
                 type: integer
+              metricRelabelings:
+                description: MetricRelabelConfigs to apply to samples before ingestion.
+                items:
+                  description: "RelabelConfig allows dynamic rewriting of the label
+                    set for targets, alerts, scraped samples and remote write samples.
+                    \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
+                  properties:
+                    action:
+                      default: replace
+                      description: "Action to perform based on the regex matching.
+                        \n `Uppercase` and `Lowercase` actions require Prometheus
+                        >= v2.36.0. `DropEqual` and `KeepEqual` actions require Prometheus
+                        >= v2.41.0. \n Default: \"Replace\""
+                      enum:
+                      - replace
+                      - Replace
+                      - keep
+                      - Keep
+                      - drop
+                      - Drop
+                      - hashmod
+                      - HashMod
+                      - labelmap
+                      - LabelMap
+                      - labeldrop
+                      - LabelDrop
+                      - labelkeep
+                      - LabelKeep
+                      - lowercase
+                      - Lowercase
+                      - uppercase
+                      - Uppercase
+                      - keepequal
+                      - KeepEqual
+                      - dropequal
+                      - DropEqual
+                      type: string
+                    modulus:
+                      description: "Modulus to take of the hash of the source label
+                        values. \n Only applicable when the action is `HashMod`."
+                      format: int64
+                      type: integer
+                    regex:
+                      description: Regular expression against which the extracted
+                        value is matched.
+                      type: string
+                    replacement:
+                      description: "Replacement value against which a Replace action
+                        is performed if the regular expression matches. \n Regex capture
+                        groups are available."
+                      type: string
+                    separator:
+                      description: Separator is the string between concatenated SourceLabels.
+                      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.
+                      items:
+                        description: LabelName is a valid Prometheus label name which
+                          may only contain ASCII letters, numbers, as well as underscores.
+                        pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                        type: string
+                      type: array
+                    targetLabel:
+                      description: "Label to which the resulting string is written
+                        in a replacement. \n It is mandatory for `Replace`, `HashMod`,
+                        `Lowercase`, `Uppercase`, `KeepEqual` and `DropEqual` actions.
+                        \n Regex capture groups are available."
+                      type: string
+                  type: object
+                type: array
               metricsPath:
                 description: MetricsPath HTTP path to scrape for metrics. If empty,
                   Prometheus uses the default value (e.g. /metrics).

diff --git a/...r-crds/templates/crd-servicemonitors.yaml → ...s/crds/templates/crd-servicemonitors.yaml b/...r-crds/templates/crd-servicemonitors.yaml → ...s/crds/templates/crd-servicemonitors.yaml
@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -609,6 +609,12 @@ spec:
                   the given Service, the `job` label of the metrics defaults to the
                   name of the Kubernetes Service."
                 type: string
+              keepDroppedTargets:
+                description: "Per-scrape limit on the number of targets dropped by
+                  relabeling that will be kept in memory. 0 means no limit. \n It
+                  requires Prometheus >= v2.47.0."
+                format: int64
+                type: integer
               labelLimit:
                 description: Per-scrape limit on number of labels that will be accepted
                   for a sample. Only valid in Prometheus versions 2.27.0 and newer.