chore(deps): update docs from repo source

Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
kumahq · Dec 12, 2023 · ca11c04 · ca11c04
1 parent 600b16f
commit ca11c04
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 6 deletions.
diff --git a/app/_data/versions.yml b/app/_data/versions.yml
@@ -71,7 +71,7 @@
   endOfLifeDate: "2024-08-29"
   branch: release-2.4
 - edition: kuma
-  version: 2.5.0
+  version: 2.5.1
   release: 2.5.x
   latest: true
   releaseDate: "2023-11-15"

diff --git a/app/docs/dev/crds/kuma.io_meshmetrics.yaml b/app/docs/dev/crds/kuma.io_meshmetrics.yaml
@@ -0,0 +1,169 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.13.0
+  name: meshmetrics.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshMetric
+    listKind: MeshMetricList
+    plural: meshmetrics
+    singular: meshmetric
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        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'
+            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'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshMetric resource.
+            properties:
+              default:
+                description: MeshMetric configuration.
+                properties:
+                  applications:
+                    description: Applications is a list of application that Dataplane
+                      Proxy will scrape
+                    items:
+                      properties:
+                        path:
+                          default: /metrics/prometheus
+                          description: Path on which an application expose HTTP endpoint
+                            with metrics.
+                          type: string
+                        port:
+                          description: Port on which an application expose HTTP endpoint
+                            with metrics.
+                          format: int32
+                          type: integer
+                      required:
+                      - port
+                      type: object
+                    type: array
+                  backends:
+                    description: Backends list that will be used to collect metrics.
+                    items:
+                      properties:
+                        name:
+                          description: Name of the backend. Needed when using MADS
+                            for DP discovery.
+                          type: string
+                        prometheus:
+                          description: Prometheus backend configuration.
+                          properties:
+                            path:
+                              default: /metrics
+                              description: Path on which a dataplane should expose
+                                HTTP endpoint with Prometheus metrics.
+                              type: string
+                            port:
+                              default: 5670
+                              description: Port on which a dataplane should expose
+                                HTTP endpoint with Prometheus metrics.
+                              format: int32
+                              type: integer
+                            tls:
+                              description: Configuration of TLS for prometheus listener.
+                              properties:
+                                mode:
+                                  default: Disabled
+                                  description: Configuration of TLS for Prometheus
+                                    listener.
+                                  enum:
+                                  - Disabled
+                                  - ProvidedTLS
+                                  - ActiveMTLSBackend
+                                  type: string
+                              required:
+                              - mode
+                              type: object
+                          required:
+                          - path
+                          - port
+                          type: object
+                        type:
+                          description: Type of the backend that will be used to collect
+                            metrics. At the moment only Prometheus backend is available.
+                          enum:
+                          - Prometheus
+                          type: string
+                      required:
+                      - type
+                      type: object
+                    type: array
+                  sidecar:
+                    description: Sidecar metrics collection configuration
+                    properties:
+                      regex:
+                        description: Regex that will be used to filter sidecar metrics.
+                          It uses Google RE2 engine https://github.com/google/re2
+                        type: string
+                      usedOnly:
+                        default: false
+                        description: UsedOnly will scrape only metrics that has been
+                          by sidecar (counters incremented at least once, gauges changed
+                          at least once, and histograms added to at least once).
+                        type: boolean
+                    type: object
+                type: object
+              targetRef:
+                description: TargetRef is a reference to the resource the policy takes
+                  an effect on. The resource could be either a real store object or
+                  virtual resource defined in-place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: 'Name of the referenced resource. Can only be used
+                      with kinds: `MeshService`, `MeshServiceSubset` and `MeshGatewayRoute`'
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: Tags used to select a subset of proxies by tags.
+                      Can only be used with kinds `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            required:
+            - targetRef
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/app/docs/dev/helm-values.yaml b/app/docs/dev/helm-values.yaml
@@ -728,6 +728,7 @@ plugins:
     meshhealthchecks: {}
     meshhttproutes: {}
     meshloadbalancingstrategies: {}
+    meshmetrics: {}
     meshproxypatches: {}
     meshratelimits: {}
     meshretries: {}

diff --git a/app/docs/dev/kuma-cp.yaml b/app/docs/dev/kuma-cp.yaml
@@ -750,11 +750,6 @@ experimental:
   # If true then control plane computes reachable services automatically based on MeshTrafficPermission.
   # Lack of MeshTrafficPermission is treated as Deny the traffic.
   autoReachableServices: false # ENV: KUMA_EXPERIMENTAL_AUTO_REACHABLE_SERVICES
-  # KDSSyncNameWithHashSuffix if true then during KDS sync resource name is going to be suffixed with hash.
-  # The hash is computed based on various resource characteristics like mesh, namespace, etc. The feature prevents name
-  # collisions when syncing policies with the same names but different meshes from Global(Universal) to Zone(Kubernetes).
-  # More extensive explanation of the problem and solution can be found in the MADR https://github.com/kumahq/kuma/blob/master/docs/madr/decisions/029-kds-sync-hash-suffix.md
-  KDSSyncNameWithHashSuffix: false # ENV: KUMA_EXPERIMENTAL_KDS_SYNC_NAME_WITH_HASH_SUFFIX
 
 proxy:
   gateway:

diff --git a/app/docs/raw/CHANGELOG.md b/app/docs/raw/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 <!-- Autogenerated with (github.com/kumahq/ci-tools) release-tool changelog.md -->
 
+## 2.5.1
+> Released on 2023/12/05
+
+* feat(dataplane): ignored listeners with ignored labels in selector (backport of #8463) [#8544](https://github.com/kumahq/kuma/pull/8544) @kumahq
+* fix(ZoneIngress): subset routing when tag is present on all subsets (backport of #8443) [#8475](https://github.com/kumahq/kuma/pull/8475) @kumahq
+* fix(metrics): fix kds metrics for simple watchdog (backport of #8428) [#8430](https://github.com/kumahq/kuma/pull/8430) @kumahq
+
+
 ## 2.5.0
 > Released on 2023/11/15