Merge branch 'main' into chore/upgrade-kuma-website

Kong · Oct 22, 2024 · 45f5596 · 45f5596
2 parents 6727cc1 + ce35b81
commit 45f5596
Show file tree

Hide file tree

Showing 57 changed files with 321 additions and 52 deletions.
diff --git a/api-specs/Gateway-EE/latest/kong-ee.yaml b/api-specs/Gateway-EE/latest/kong-ee.yaml
@@ -12416,6 +12416,32 @@ paths:
                   recovery_private_key: /path/to/generated/<base64-encoded-contents-of-key.pem>
       tags:
         - Keyring
+  /keyring/remove:
+    post:
+      summary: Remove key
+      operationId: post-keyring-remove
+      responses:
+        '204':
+          description: No Content
+        '401': 
+          $ref: '#/components/responses/HTTP401Error'
+      description: Remove a key from the keyring.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              x-examples:
+                Example 1:
+                  key: 3Rwvk223
+              properties:
+                key:
+                  type: string
+                  description: The key ID
+                  example: 3Rwvk223
+        description: The request body contains a key ID that can be generated from the `/keyring/generate` endpoint.
+      tags:
+        - Keyring
   /keyring/export:
     post:
       summary: Export keyring

diff --git a/api-specs/Konnect/v2/yaml/analytics-requests.yaml b/api-specs/Konnect/v2/yaml/analytics-requests.yaml
@@ -75,6 +75,7 @@ components:
                   - $ref: '#/components/schemas/ControlPlaneFilterByField'
                   - $ref: '#/components/schemas/ControlPlaneGroupFilterByField'
                   - $ref: '#/components/schemas/DataPlaneNodeFilterByField'
+                  - $ref: '#/components/schemas/DataPlaneNodeVersionFilterByField'
                   - $ref: '#/components/schemas/GatewayServiceFilterByField'
                   - $ref: '#/components/schemas/HeaderHostFilterByField'
                   - $ref: '#/components/schemas/HeaderUserAgentFilterByField'
@@ -723,6 +724,23 @@ components:
         - type
         - values
       title: Filter by data_plane_node
+    DataPlaneNodeVersionFilterByField:
+      allOf:
+        - type: object
+          properties:
+            field:
+              description: The field to filter.
+              type: string
+              enum:
+                - data_plane_node_version
+          required:
+            - field
+        - oneOf:
+            - $ref: '#/components/schemas/FilterMultiValueString'
+            - $ref: '#/components/schemas/FilterSingleValueString'
+            - $ref: '#/components/schemas/FilterWildcard'
+            - $ref: '#/components/schemas/FilterEmpty'
+      title: Filter by data_plane_node_version
     GatewayServiceFilterByField:
       allOf:
         - type: object
@@ -1337,6 +1355,9 @@ components:
           data_plane_node:
             description: 'Data Plane Node ID associated with the request. In the format `control_plane_id:data_plane_node_id` if the node belongs to a control plane or `control_plane_group_id:data_plane_node_id` if the node belongs to a control plane group.'
             type: string
+          data_plane_node_version:
+            description: Version used by the Data Plane Node associated with the request.
+            type: string
           gateway_service:
             description: 'Gateway Service ID associated with the request. In the format `control_plane_id:gateway_service_id`.'
             type: string
@@ -1696,6 +1717,7 @@ components:
             control_plane: d5ac5d88-efed-4e10-9dfe-0b0a6646c219
             control_plane_group: cafe2d4f-95ec-458c-8c88-62417018678d
             data_plane_node: 'cafe2d4f-95ec-458c-8c88-62417018678d:122a0f86-029c-4292-82fd-f3b38e1cfa60'
+            data_plane_node_version: 3.8.0.1
             gateway_service: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:523468b1-2e74-4b58-b30e-6f904e99e4d0'
             header_host: google.com
             header_user_agent: Mozilla/4.0 (compatible; Flight Explorer)
@@ -1748,6 +1770,7 @@ components:
             control_plane: d5ac5d88-efed-4e10-9dfe-0b0a6646c219
             control_plane_group: null
             data_plane_node: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:a3e0692c-2351-4c8e-acbe-e7a5185147de'
+            data_plane_node_version: 3.8.0.1
             gateway_service: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:523468b1-2e74-4b58-b30e-6f904e99e4d0'
             header_host: proxy-zyq.com
             header_user_agent: python-works

diff --git a/app/_data/docs_nav_mesh_2.10.x.yml b/app/_data/docs_nav_mesh_2.10.x.yml
@@ -0,0 +1,182 @@
+generate: true
+assume_generated: true
+release: 2.10.x
+max_depth: 3
+inherit:
+  path: /.repos/kuma/app/_src
+  nav: ../_src/.repos/kuma/app/_data/docs_nav_kuma_dev.yml
+  patches:
+    - path: [ Introduction ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-flag.svg
+    - path: [ Introduction, Overview of Kuma ]
+      text: Overview of Kong Mesh
+      url: /
+      src: null
+      action: modify
+    - path: [ Introduction, How Kuma works ]
+      text: How Kong Mesh works
+      url: /introduction/how-kong-mesh-works
+      action: modify
+      items: []
+    - path: [ Introduction, Kuma requirements ]
+      text: Mesh requirements
+      action: modify
+    - path: [ Introduction ]
+      text: Stages of software availability
+      url: /availability-stages/
+      action: insert
+      index: -3
+    - path: [ Introduction ]
+      text: Version support policy
+      url: /support-policy/
+      action: insert
+      index: -3
+    - path: [ Introduction, Release notes]
+      url: /mesh/changelog
+      src: /mesh/changelog
+      action: modify
+    - path: [ Kuma in Production ]
+      action: modify
+      title: Kong Mesh in Production
+      icon: /assets/images/icons/documentation/icn-deployment-color.svg
+    - path: [ Kong Mesh in Production, Kuma user interface ]
+      action: modify
+      text: Kong Mesh user interface
+    - path: [ Kong Mesh in Production, Use Kuma ]
+      action: modify
+      text: Use Kong Mesh
+    - path: [ Kong Mesh in Production, Control plane deployment ]
+      action: insert
+      index: 0
+      text: Kong Mesh license
+      url: /production/cp-deployment/license
+    - path: [ Kong Mesh in Production, Control plane deployment ]
+      action: insert
+      index: -1
+      text: Deploy Kong Mesh in Production with Helm
+      url: /production/cp-deployment/production-usage-values
+    - path: [ Kong Mesh in Production, Secure your deployment ]
+      action: delete
+      entries: [ Kuma API access control ]
+    - path: [ Kong Mesh in Production, Secure your deployment ]
+      action: insert
+      index: -1
+      text: Kong Mesh RBAC
+      url: /features/rbac
+    - path: [ Kong Mesh in Production, Secure your deployment ]
+      action: insert
+      index: -1
+      text: FIPS support
+      url: /features/fips-support
+    - path: [ Kong Mesh in Production, Data plane configuration, Configure the Kuma CNI ]
+      action: modify
+      text: Configure the Kong Mesh CNI
+    - path: [ Kong Mesh in Production, Upgrades and tuning, Upgrade Kuma ]
+      action: modify
+      text: Upgrade Kong Mesh
+    - path: [ Quickstart ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-quickstart-color.svg
+    - path: [ Quickstart, Deploy Kuma on Kubernetes ]
+      text: Deploy Kong Mesh on Kubernetes
+      action: modify
+      items: []
+    - path: [ Using Kuma ]
+      title: Using Kong Mesh
+      action: modify
+      icon: /assets/images/icons/documentation/icn-overview-color.svg
+    - path: [ Using Kong Mesh, Route & Traffic shaping, Protocol support in Kuma ]
+      text: Protocol support in Kong Mesh
+      action: modify
+      url: /policies/protocol-support-in-kong-mesh
+      items: []
+    - path: [ Policies ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-documentation-small.svg
+    - path: [ Policies, Previous Policies, General notes about Kuma policies ]
+      text: General notes about Kong Mesh policies
+      url: /policies/general-notes-about-kong-mesh-policies
+      action: modify
+    - path: [ Policies, Previous Policies, How Kuma chooses the right policy to apply ]
+      text: How Kong Mesh chooses the right policy to apply
+      action: modify
+      url: /policies/how-kong-mesh-chooses-the-right-policy-to-apply
+      items: []
+    - path: [ Policies, Previous Policies ]
+      action: insert
+      index: -1
+      text: OPA policy
+      url: /features/opa
+      generate: false
+    - path: [ Policies ]
+      action: insert
+      index: -2
+      text: MeshOPA 
+      url: /features/meshopa
+      generate: false
+    - path: [ Policies ]
+      action: insert
+      index: -2
+      text: MeshGlobalRateLimit (beta)
+      url: /features/meshglobalratelimit
+      generate: false
+    - path: [ Guides ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-learning.svg
+    - title: Enterprise Features
+      action: insert
+      index: -3
+      icon: /assets/images/icons/documentation/icn-enterprise-blue.svg
+      items:
+        - text: Overview
+          url: /features/
+        - text: HashiCorp Vault CA
+          url: /features/vault
+        - text: Amazon ACM Private CA
+          url: /features/acmpca
+        - text: cert-manager Private CA
+          url: /features/cert-manager
+        - text: OPA policy support
+          url: /features/opa
+        - text: MeshOPA (beta)
+          url: /features/meshopa
+        - text: Multi-zone authentication
+          url: /features/kds-auth
+        - text: FIPS support
+          url: /features/fips-support
+          generate: false
+        - text: Certificate Authority rotation
+          url: /features/ca-rotation
+        - text: Role-Based Access Control
+          url: /features/rbac
+          generate: false
+        - text: Red Hat
+          items:
+            - text: UBI Images
+              url: /features/ubi-images
+            - text: Red Hat OpenShift Quickstart
+              url: /features/openshift-quickstart
+        - text: ECS Support
+          url: /installation/ecs
+        - text: Auditing
+          url: /features/access-audit
+        - text: MeshGlobalRateLimit (beta)
+          url: /features/meshglobalratelimit
+    - path: [ Reference ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-references-color.svg
+    - path: [ Community ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-references-color.svg
+    - path: [ Community ]
+      action: delete
+      entries: [ License ]
+    - path: [ Community, Contribute to Kuma ]
+      action: modify
+      src: null
+      absolute_url: true
+      url: https://kuma.io/community
+unlisted:
+  - url: /install
+    src: /mesh/install
diff --git a/app/_data/kong_versions.yml b/app/_data/kong_versions.yml
@@ -407,13 +407,15 @@
 - edition: mesh
   version: 2.8.4
   release: 2.8.x
-  latest: true
   releaseDate: "2024-06-24"
   endOfLifeDate: "2025-06-24"
   branch: release-2.8
 - edition: mesh
   version: 2.9.0
   release: 2.9.x
+  latest: true
+  releaseDate: "2024-10-22"
+  endOfLifeDate: "2025-10-22"
   branch: release-2.9
 - edition: mesh
   version: preview

diff --git a/app/_src/gateway/kong-enterprise/db-encryption.md b/app/_src/gateway/kong-enterprise/db-encryption.md
@@ -42,6 +42,8 @@ export KONG_KEYRING_STRATEGY=cluster
 export KONG_KEYRING_RECOVERY_PUBLIC_KEY=/path/to/generated/cert.pem
 ```
 
+If you are using a hybrid deployment, you only need this configuration on the control planes, since the data planes don't connect to the database.
+
 All nodes in the Kong cluster should share the same `keyring_enabled` and `keyring_strategy` configuration values.
 The generated private key `key.pem` is not required to configure Kong, or to start Kong. Please refer to the [disaster recovery](#disaster-recovery) section for more information on how to use private keys in keyring management.
 

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_circuitbreakers.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_circuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_containerpatches.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_containerpatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: containerpatches.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_dataplaneinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_dataplaneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_dataplanes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_dataplanes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: dataplanes.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_externalservices.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_externalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: externalservices.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_faultinjections.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_faultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: faultinjections.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_healthchecks.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_healthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: healthchecks.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_hostnamegenerators.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_hostnamegenerators.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshaccesslogs.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshaccesslogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshcircuitbreakers.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshcircuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io

diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshes.kuma.io
 spec:
   group: kuma.io