Merge pull request #39826 from denkensk/doc-matchLabels-beta-1.27

doc: graduate matchLabelKeys in podTopologySpread to beta
kubernetes · Mar 7, 2023 · 5a97479 · 5a97479
2 parents a6b1df5 + d842569
commit 5a97479
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/content/en/docs/concepts/scheduling-eviction/topology-spread-constraints.md b/content/en/docs/concepts/scheduling-eviction/topology-spread-constraints.md
@@ -64,7 +64,7 @@ spec:
       topologyKey: <string>
       whenUnsatisfiable: <string>
       labelSelector: <object>
-      matchLabelKeys: <list> # optional; alpha since v1.25
+      matchLabelKeys: <list> # optional; beta since v1.27
       nodeAffinityPolicy: [Honor|Ignore] # optional; beta since v1.26
       nodeTaintsPolicy: [Honor|Ignore] # optional; beta since v1.26
   ### other Pod fields go here
@@ -144,9 +144,8 @@ your cluster. Those fields are:
   ```
 
   {{< note >}}
-  The `matchLabelKeys` field is an alpha field added in 1.25. You have to enable the
-  `MatchLabelKeysInPodTopologySpread` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
-  in order to use it.
+  The `matchLabelKeys` field is a beta-level field and enabled by default in 1.27. You can disable it by disabling the
+  `MatchLabelKeysInPodTopologySpread` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/).
   {{< /note >}}
 
 - **nodeAffinityPolicy** indicates how we will treat Pod's nodeAffinity/nodeSelector

diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates.md b/content/en/docs/reference/command-line-tools-reference/feature-gates.md
@@ -134,7 +134,8 @@ For a reference to old feature gates that are removed, please refer to
 | `LogarithmicScaleDown` | `true` | Beta | 1.22 | |
 | `LoggingAlphaOptions` | `false` | Alpha | 1.24 | - |
 | `LoggingBetaOptions` | `true` | Beta | 1.24 | - |
-| `MatchLabelKeysInPodTopologySpread` | `false` | Alpha | 1.25 | |
+| `MatchLabelKeysInPodTopologySpread` | `false` | Alpha | 1.25 | 1.26 |
+| `MatchLabelKeysInPodTopologySpread` | `true` | Beta | 1.27 | - |
 | `MaxUnavailableStatefulSet` | `false` | Alpha | 1.24 | |
 | `MemoryManager` | `false` | Alpha | 1.21 | 1.21 |
 | `MemoryManager` | `true` | Beta | 1.22 | |