github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84339 from wojtek-t/fix_deployment_correctness_at_scale

Browse Source 
Fix deployment e2e test at scale
This commit is contained in:
Kubernetes Prow Robot 2019-10-25 05:17:42 -07:00 committed by GitHub
commit f430a47b60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/e2e/apps/deployment.go
View File

@ -888,7 +888,7 @@ func testRollingUpdateDeploymentWithLocalTrafficLoadBalancer(f *framework.Framew
// inter-pod affinity for pods of different rollouts and anti-affinity // inter-pod affinity for pods of different rollouts and anti-affinity
// for pods of the same rollout, so it will need to be updated when // for pods of the same rollout, so it will need to be updated when
// performing a rollout. // performing a rollout.
setAffinity(d) setAffinities(d, false)
d.Spec.Strategy.RollingUpdate = &appsv1.RollingUpdateDeployment{ d.Spec.Strategy.RollingUpdate = &appsv1.RollingUpdateDeployment{
MaxSurge: intOrStrP(1), MaxSurge: intOrStrP(1),
MaxUnavailable: intOrStrP(0), MaxUnavailable: intOrStrP(0),
@ -943,7 +943,7 @@ func testRollingUpdateDeploymentWithLocalTrafficLoadBalancer(f *framework.Framew
framework.Logf("Updating label deployment %q pod spec (iteration #%d)", name, i) framework.Logf("Updating label deployment %q pod spec (iteration #%d)", name, i)
deployment, err = e2edeploy.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *appsv1.Deployment) { deployment, err = e2edeploy.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *appsv1.Deployment) {
update.Spec.Template.Labels["iteration"] = fmt.Sprintf("%d", i) update.Spec.Template.Labels["iteration"] = fmt.Sprintf("%d", i)
setAffinity(update) setAffinities(update, true)
}) })
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -963,32 +963,14 @@ func testRollingUpdateDeploymentWithLocalTrafficLoadBalancer(f *framework.Framew
} }
} }
func setAffinity(d *appsv1.Deployment) { // setAffinities set PodAntiAffinity across pods from the same generation
d.Spec.Template.Spec.Affinity = &v1.Affinity{ // of Deployment and if, explicitly requested, also affinity with pods
PodAffinity: &v1.PodAffinity{ // from other generations.
PreferredDuringSchedulingIgnoredDuringExecution: []v1.WeightedPodAffinityTerm{ // It is required to make those "Required" so that in large clusters where
{ // scheduler may not score all nodes if a lot of them are feasible, the
Weight: int32(100), // test will also have a chance to pass.
PodAffinityTerm: v1.PodAffinityTerm{ func setAffinities(d *appsv1.Deployment, setAffinity bool) {
TopologyKey: "kubernetes.io/hostname", affinity := &v1.Affinity{
LabelSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "name",
Operator: metav1.LabelSelectorOpIn,
Values: []string{d.Spec.Template.Labels["name"]},
},
{
Key: "iteration",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{d.Spec.Template.Labels["iteration"]},
},
},
},
},
},
},
},
PodAntiAffinity: &v1.PodAntiAffinity{ PodAntiAffinity: &v1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{ RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{
{ {
@ -1011,4 +993,28 @@ func setAffinity(d *appsv1.Deployment) {
}, },
}, },
} }
if setAffinity {
affinity.PodAffinity = &v1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{
{
TopologyKey: "kubernetes.io/hostname",
LabelSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "name",
Operator: metav1.LabelSelectorOpIn,
Values: []string{d.Spec.Template.Labels["name"]},
},
{
Key: "iteration",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{d.Spec.Template.Labels["iteration"]},
},
},
},
},
},
}
}
d.Spec.Template.Spec.Affinity = affinity
} }