Skip to content

Commit 5a97479

Browse files
authored
Merge pull request #39826 from denkensk/doc-matchLabels-beta-1.27
doc: graduate matchLabelKeys in podTopologySpread to beta
2 parents a6b1df5 + d842569 commit 5a97479

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

content/en/docs/concepts/scheduling-eviction/topology-spread-constraints.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
topologyKey: <string>
6565
whenUnsatisfiable: <string>
6666
labelSelector: <object>
67-
matchLabelKeys: <list> # optional; alpha since v1.25
67+
matchLabelKeys: <list> # optional; beta since v1.27
6868
nodeAffinityPolicy: [Honor|Ignore] # optional; beta since v1.26
6969
nodeTaintsPolicy: [Honor|Ignore] # optional; beta since v1.26
7070
### other Pod fields go here
@@ -144,9 +144,8 @@ your cluster. Those fields are:
144144
```
145145
146146
{{< note >}}
147-
The `matchLabelKeys` field is an alpha field added in 1.25. You have to enable the
148-
`MatchLabelKeysInPodTopologySpread` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
149-
in order to use it.
147+
The `matchLabelKeys` field is a beta-level field and enabled by default in 1.27. You can disable it by disabling the
148+
`MatchLabelKeysInPodTopologySpread` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/).
150149
{{< /note >}}
151150

152151
- **nodeAffinityPolicy** indicates how we will treat Pod's nodeAffinity/nodeSelector

content/en/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ For a reference to old feature gates that are removed, please refer to
134134
| `LogarithmicScaleDown` | `true` | Beta | 1.22 | |
135135
| `LoggingAlphaOptions` | `false` | Alpha | 1.24 | - |
136136
| `LoggingBetaOptions` | `true` | Beta | 1.24 | - |
137-
| `MatchLabelKeysInPodTopologySpread` | `false` | Alpha | 1.25 | |
137+
| `MatchLabelKeysInPodTopologySpread` | `false` | Alpha | 1.25 | 1.26 |
138+
| `MatchLabelKeysInPodTopologySpread` | `true` | Beta | 1.27 | - |
138139
| `MaxUnavailableStatefulSet` | `false` | Alpha | 1.24 | |
139140
| `MemoryManager` | `false` | Alpha | 1.21 | 1.21 |
140141
| `MemoryManager` | `true` | Beta | 1.22 | |

0 commit comments

Comments
 (0)