update crd

2026-06-04 23:22:18 +01:00
parent 95675c2c1f
commit 8e57124a0c
26 changed files with 1524 additions and 86 deletions
@@ -60,7 +60,8 @@
                "enum": [
                  "OAuth",
                  "ManagedIdentity",
-                  "SDK"
+                  "SDK",
+                  "WorkloadIdentity"
                ],
                "type": "string"
              },
@@ -593,7 +594,7 @@
                "type": "string"
              },
              "tlsConfig": {
-                "description": "tlsConfig defies the TLS configuration applying to the target HTTP endpoint.",
+                "description": "tlsConfig defines the TLS configuration applying to the target HTTP endpoint.",
                "properties": {
                  "ca": {
                    "description": "ca defines the Certificate authority used when verifying server certificates.",
@@ -939,7 +940,7 @@
                "type": "boolean"
              },
              "filter": {
-                "description": "filter defines the filter expression used to filter the catalog results.\nSee https://www.consul.io/api-docs/catalog#list-services\nIt requires Prometheus >= 3.0.0.",
+                "description": "filter defines the filter expression used to filter the catalog results.\nSee https://developer.hashicorp.com/consul/api-docs/catalog#filtering\nIt requires Prometheus >= 3.0.0.",
                "minLength": 1,
                "type": "string"
              },
@@ -947,6 +948,11 @@
                "description": "followRedirects defines whether HTTP requests follow HTTP 3xx redirects.",
                "type": "boolean"
              },
+              "healthFilter": {
+                "description": "healthFilter defines the filter expression used to filter the health results.\nSee https://developer.hashicorp.com/consul/api-docs/health#filtering\nIt requires Prometheus >= 3.11.2.",
+                "minLength": 1,
+                "type": "string"
+              },
              "namespace": {
                "description": "namespace are only supported in Consul Enterprise.\n\nIt requires Prometheus >= 2.28.0.",
                "minLength": 1,
@@ -8661,6 +8667,7 @@
              },
              "roleARN": {
                "description": "roleARN defines the AWS Role ARN, an alternative to using AWS API keys.",
+                "minLength": 1,
                "type": "string"
              },
              "secretKey": {
@@ -9700,6 +9707,7 @@
              },
              "namespace": {
                "description": "namespace defines the Nomad namespace to query for service discovery.\nWhen specified, only resources within this namespace will be discovered.",
+                "minLength": 1,
                "type": "string"
              },
              "noProxy": {
@@ -10078,6 +10086,7 @@
              },
              "region": {
                "description": "region defines the Nomad region to query for service discovery.\nWhen specified, only resources within this region will be discovered.",
+                "minLength": 1,
                "type": "string"
              },
              "server": {
@@ -10087,6 +10096,7 @@
              },
              "tagSeparator": {
                "description": "tagSeparator defines the separator used to join multiple tags.\nThis determines how Nomad service tags are concatenated into Prometheus labels.",
+                "minLength": 1,
                "type": "string"
              },
              "tlsConfig": {
@@ -10602,6 +10612,7 @@
              },
              "applicationCredentialId": {
                "description": "applicationCredentialId defines the OpenStack applicationCredentialId.",
+                "minLength": 1,
                "type": "string"
              },
              "applicationCredentialName": {
@@ -11804,7 +11815,7 @@
        "scalewaySDConfigs": {
          "description": "scalewaySDConfigs defines a list of Scaleway instances and baremetal service discovery configurations.",
          "items": {
-            "description": "ScalewaySDConfig configurations allow retrieving scrape targets from Scaleway instances and baremetal services.\nSee https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scaleway_sd_config",
+            "description": "ScalewaySDConfig configurations allow retrieving scrape targets from Scaleway instances and baremetal services.\nSee https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scaleway_sd_config\n\nNote: The `_file` variants of credential fields (e.g. `secret_key_file`)\nfrom the Prometheus configuration are not supported. Use Kubernetes secrets via `secretKey` instead.",
            "properties": {
              "accessKey": {
                "description": "accessKey defines the access key to use. https://console.scaleway.com/project/credentials",
@@ -12382,6 +12393,12 @@
        }
      },
      "type": "object",
+      "x-kubernetes-validations": [
+        {
+          "message": "at most one of basicAuth, authorization, or oauth2 can be configured",
+          "rule": "[has(self.basicAuth), has(self.authorization), has(self.oauth2)].filter(x, x).size() <= 1"
+        }
+      ],
      "additionalProperties": false
    },
    "status": {