mirror of https://github.com/k3s-io/k3s
Merge pull request #66599 from cofyc/fixfeaturegate
Automatic merge from submit-queue (batch tested with PRs 66540, 66599). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Invalidate CheckVolumeBinding predicate only when VolumeScheduling feature is enabled **What this PR does / why we need it**: Invalidate CheckVolumeBinding predicate only when VolumeScheduling feature is enabled. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```pull/8/head
commit
e4465b6e2f
|
@ -408,7 +408,9 @@ func (c *configFactory) invalidatePredicatesForPvUpdate(oldPV, newPV *v1.Persist
|
|||
// which will cache PVs in PodBindingCache. When PV got updated, we should
|
||||
// invalidate cache, otherwise PVAssumeCache.Assume will fail with out of sync
|
||||
// error.
|
||||
invalidPredicates.Insert(predicates.CheckVolumeBindingPred)
|
||||
if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
|
||||
invalidPredicates.Insert(predicates.CheckVolumeBindingPred)
|
||||
}
|
||||
for k, v := range newPV.Labels {
|
||||
// If PV update modifies the zone/region labels.
|
||||
if isZoneRegionLabel(k) && !reflect.DeepEqual(v, oldPV.Labels[k]) {
|
||||
|
|
Loading…
Reference in New Issue