Merge branch 'master' into release29

kumahq · Nov 8, 2024 · 68d0d19 · 68d0d19
2 parents 895076f + e7b4096
commit 68d0d19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/app/_data/versions.yml b/app/_data/versions.yml
@@ -103,7 +103,7 @@
   endOfLifeDate: "2025-10-22"
   branch: release-2.9
 - edition: kuma
-  version: 2.10.0
+  version: preview
   release: 2.10.x
-  label: dev
   branch: master
+  label: dev
diff --git a/app/assets/dev/raw/kuma-cp.yaml b/app/assets/dev/raw/kuma-cp.yaml
@@ -766,11 +766,6 @@ experimental:
   # Enables sidecar containers in Kubernetes if supported by the Kubernetes
   # environment.
   sidecarContainers: false # ENV: KUMA_EXPERIMENTAL_SIDECAR_CONTAINERS
-  # If true then it generates MeshServices from Kubernetes Service.
-  generateMeshServices: false # ENV: KUMA_EXPERIMENTAL_GENERATE_MESH_SERVICES
-  # If true skips persisted VIPs. Change to true only if generateMeshServices is enabled.
-  # Do not enable on production.
-  skipPersistedVIPs: false # ENV: KUMA_EXPERIMENTAL_SKIP_PERSISTED_VIPS
 proxy:
   gateway:
     # Sets the envoy runtime value to limit maximum number of incoming