mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 02:33:34 +00:00
rebase: Bump github.com/aws/aws-sdk-go from 1.44.301 to 1.44.307
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.301 to 1.44.307. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.301...v1.44.307) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
mergify[bot]
parent
0f086bead2
commit
a2762b8ed5
7
vendor/k8s.io/kubernetes/pkg/apis/core/validation/validation.go
generated
vendored
7
vendor/k8s.io/kubernetes/pkg/apis/core/validation/validation.go
generated
vendored
@ -4727,7 +4727,14 @@ func ValidatePodUpdate(newPod, oldPod *core.Pod, opts PodValidationOptions) fiel
|
||||
// already effectively nil, no change needed
|
||||
case mungedPodSpec.Affinity == nil && oldNodeAffinity != nil:
|
||||
mungedPodSpec.Affinity = &core.Affinity{NodeAffinity: oldNodeAffinity} // +k8s:verify-mutation:reason=clone
|
||||
case mungedPodSpec.Affinity != nil && oldPod.Spec.Affinity == nil &&
|
||||
mungedPodSpec.Affinity.PodAntiAffinity == nil && mungedPodSpec.Affinity.PodAffinity == nil:
|
||||
// We ensure no other fields are being changed, but the NodeAffinity. If that's the case, and the
|
||||
// old pod's affinity is nil, we set the mungedPodSpec's affinity to nil.
|
||||
mungedPodSpec.Affinity = nil // +k8s:verify-mutation:reason=clone
|
||||
default:
|
||||
// The node affinity is being updated and the old pod Affinity is not nil.
|
||||
// We set the mungedPodSpec's node affinity to the old pod's node affinity.
|
||||
mungedPodSpec.Affinity.NodeAffinity = oldNodeAffinity // +k8s:verify-mutation:reason=clone
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user