github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65854 from cofyc/statefulset_with_podaffinity

Browse Source 
Automatic merge from submit-queue. 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>.

Add local volume pod affinity tests.

**What this PR does / why we need it**:

Add local volume pod affinity tests.

**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 #56100 (with already merged prs #59682, #60260)

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-07-10 20:00:12 -07:00 committed by GitHub
commit bababe08f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
test/e2e/storage/persistent_volumes-local.go
View File

@ -524,17 +524,14 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
}) })
}) })
Context("StatefulSet with pod anti-affinity", func() { Context("StatefulSet with pod affinity", func() {
var testVols map[string][]*localTestVolume var testVols map[string][]*localTestVolume
const ( const (
ssReplicas = 3 ssReplicas = 3
volsPerNode = 2 volsPerNode = 6
) )
BeforeEach(func() { BeforeEach(func() {
if len(config.nodes) < ssReplicas {
framework.Skipf("Runs only when number of nodes >= %v", ssReplicas)
}
setupStorageClass(config, &waitMode) setupStorageClass(config, &waitMode)
testVols = map[string][]*localTestVolume{} testVols = map[string][]*localTestVolume{}
@ -553,10 +550,19 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
cleanupStorageClass(config) cleanupStorageClass(config)
}) })
It("should use volumes spread across nodes", func() { It("should use volumes spread across nodes when pod has anti-affinity", func() {
if len(config.nodes) < ssReplicas {
framework.Skipf("Runs only when number of nodes >= %v", ssReplicas)
}
By("Creating a StatefulSet with pod anti-affinity on nodes") By("Creating a StatefulSet with pod anti-affinity on nodes")
ss := createStatefulSet(config, ssReplicas, volsPerNode) ss := createStatefulSet(config, ssReplicas, volsPerNode, true)
validateStatefulSet(config, ss) validateStatefulSet(config, ss, true)
})
It("should use volumes on one node when pod has affinity", func() {
By("Creating a StatefulSet with pod affinity on nodes")
ss := createStatefulSet(config, ssReplicas, volsPerNode/ssReplicas, false)
validateStatefulSet(config, ss, false)
}) })
}) })
@ -1803,7 +1809,7 @@ func findLocalPersistentVolume(c clientset.Interface, volumePath string) (*v1.Pe
return nil, nil return nil, nil
} }
func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount int) *appsv1.StatefulSet { func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount int, anti bool) *appsv1.StatefulSet {
mounts := []v1.VolumeMount{} mounts := []v1.VolumeMount{}
claims := []v1.PersistentVolumeClaim{} claims := []v1.PersistentVolumeClaim{}
for i := 0; i < volumeCount; i++ { for i := 0; i < volumeCount; i++ {
@ -1813,25 +1819,32 @@ func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount in
claims = append(claims, *pvc) claims = append(claims, *pvc)
} }
affinity := v1.Affinity{ podAffinityTerms := []v1.PodAffinityTerm{
PodAntiAffinity: &v1.PodAntiAffinity{ {
RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{ LabelSelector: &metav1.LabelSelector{
{ MatchExpressions: []metav1.LabelSelectorRequirement{
LabelSelector: &metav1.LabelSelector{ {
MatchExpressions: []metav1.LabelSelectorRequirement{ Key: "app",
{ Operator: metav1.LabelSelectorOpIn,
Key: "app", Values: []string{"local-volume-test"},
Operator: metav1.LabelSelectorOpIn,
Values: []string{"local-volume-test"},
},
},
}, },
TopologyKey: "kubernetes.io/hostname",
}, },
}, },
TopologyKey: "kubernetes.io/hostname",
}, },
} }
affinity := v1.Affinity{}
if anti {
affinity.PodAntiAffinity = &v1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: podAffinityTerms,
}
} else {
affinity.PodAffinity = &v1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: podAffinityTerms,
}
}
labels := map[string]string{"app": "local-volume-test"} labels := map[string]string{"app": "local-volume-test"}
spec := &appsv1.StatefulSet{ spec := &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -1870,16 +1883,21 @@ func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount in
return ss return ss
} }
func validateStatefulSet(config *localTestConfig, ss *appsv1.StatefulSet) { func validateStatefulSet(config *localTestConfig, ss *appsv1.StatefulSet, anti bool) {
pods := config.ssTester.GetPodList(ss) pods := config.ssTester.GetPodList(ss)
// Verify that each pod is on a different node
nodes := sets.NewString() nodes := sets.NewString()
for _, pod := range pods.Items { for _, pod := range pods.Items {
nodes.Insert(pod.Spec.NodeName) nodes.Insert(pod.Spec.NodeName)
} }
Expect(nodes.Len()).To(Equal(len(pods.Items))) if anti {
// Verify that each pod is on a different node
Expect(nodes.Len()).To(Equal(len(pods.Items)))
} else {
// Verify that all pods are on same node.
Expect(nodes.Len()).To(Equal(1))
}
// Validate all PVCs are bound // Validate all PVCs are bound
for _, pod := range pods.Items { for _, pod := range pods.Items {