@@ -420,7 +420,8 @@ from the default constraints, but also all incoming pods during v1.34.
420
420
We're going to change kube-scheduler to only concern `matchLabelKeys` from the default constraints at v1.35 for efficiency,
421
421
assuming kube-apiserver handles `matchLabelKeys` of all incoming pods.
422
422
423
- This implementation change can be disabled by the `MatchLabelKeysInPodTopologySpreadSelectorMerge` feature flag.
423
+ Also, in case of bugs in this new design, users can disable this feature through a new feature flag,
424
+ ` MatchLabelKeysInPodTopologySpreadSelectorMerge` (enabled by default).
424
425
(See more details in [Feature Enablement and Rollback](#feature-enablement-and-rollback))
425
426
426
427
# ## Test Plan
@@ -655,14 +656,18 @@ you need any help or guidance.
655
656
This section must be completed when targeting alpha to a release.
656
657
-->
657
658
658
- - ` MatchLabelKeysInPodTopologySpread` feature flag will toggle enabling `MatchLabelKeys` in `TopologySpreadConstraint`.
659
- - ` MatchLabelKeysInPodTopologySpreadSelectorMerge` feature flag will toggle merging the key-value labels
660
- corresponding to `MatchLabelKeys` into `LabelSelector` of `TopologySpreadConstraint`.
661
- This flag cannot be enabled on its own, and has to be enabled together with `MatchLabelKeysInPodTopologySpread`.
659
+ - ` MatchLabelKeysInPodTopologySpread` feature flag enables the `MatchLabelKeys` feature in `TopologySpreadConstraint`.
660
+ - ` MatchLabelKeysInPodTopologySpreadSelectorMerge` feature flag enables the new design described at
661
+ [[v1.34] design change and a safe upgrade path](#v134-design-change-and-a-safe-upgrade-path).
662
+ - If `MatchLabelKeysInPodTopologySpreadSelectorMerge` is disabled while `MatchLabelKeysInPodTopologySpread` is enabled,
663
+ Kubernetes handles `MatchLabelKeys` with the classic design, kube-scheduler handles it.
664
+ However, that's basically not recommended unless you encounter a bug in a new design behavior.
665
+ - This flag cannot be enabled on its own, and has to be enabled together with `MatchLabelKeysInPodTopologySpread`.
666
+ Enabling `MatchLabelKeysInPodTopologySpreadSelectorMerge` alone has no effect, and `matchLabelKeys` will be ignored.
662
667
663
668
The `MatchLabelKeysInPodTopologySpreadSelectorMerge` feature flag has been added in v1.34 and enabled by default.
664
669
This flag can be disabled to revert [the implementation design change in v1.34](#v134-design-change-and-a-safe-upgrade-path)
665
- and go back to the previous behavior.
670
+ and go back to the previous behavior in case of bug .
666
671
667
672
# ##### How can this feature be enabled / disabled in a live cluster?
668
673
0 commit comments