github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a bug checking DaemonSet pods are updated in e2e test

pull/6/head
Janet Kuo 2017-10-31 17:47:23 -07:00
parent 09d896bfd0
commit 9bd720b39e
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/apps/daemon_set.go
View File

@ -660,7 +660,13 @@ func checkDaemonPodOnNodes(f *framework.Framework, ds *extensions.DaemonSet, nod
func checkRunningOnAllNodes(f *framework.Framework, ds *extensions.DaemonSet) func() (bool, error) { func checkRunningOnAllNodes(f *framework.Framework, ds *extensions.DaemonSet) func() (bool, error) {
return func() (bool, error) { return func() (bool, error) {
nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{}) nodeNames := schedulableNodes(f.ClientSet, ds)
return checkDaemonPodOnNodes(f, ds, nodeNames)()
}
}
func schedulableNodes(c clientset.Interface, ds *extensions.DaemonSet) []string {
nodeList, err := c.CoreV1().Nodes().List(metav1.ListOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
nodeNames := make([]string, 0) nodeNames := make([]string, 0)
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
@ -670,8 +676,7 @@ func checkRunningOnAllNodes(f *framework.Framework, ds *extensions.DaemonSet) fu
} }
nodeNames = append(nodeNames, node.Name) nodeNames = append(nodeNames, node.Name)
} }
return checkDaemonPodOnNodes(f, ds, nodeNames)() return nodeNames
}
} }
func checkAtLeastOneNewPod(c clientset.Interface, ns string, label map[string]string, newImage string) func() (bool, error) { func checkAtLeastOneNewPod(c clientset.Interface, ns string, label map[string]string, newImage string) func() (bool, error) {
@ -724,15 +729,16 @@ func checkDaemonPodsImageAndAvailability(c clientset.Interface, ds *extensions.D
pods := podList.Items pods := podList.Items
unavailablePods := 0 unavailablePods := 0
allImagesUpdated := true nodesToUpdatedPodCount := make(map[string]int)
for _, pod := range pods { for _, pod := range pods {
if !metav1.IsControlledBy(&pod, ds) { if !metav1.IsControlledBy(&pod, ds) {
continue continue
} }
podImage := pod.Spec.Containers[0].Image podImage := pod.Spec.Containers[0].Image
if podImage != image { if podImage != image {
allImagesUpdated = false
framework.Logf("Wrong image for pod: %s. Expected: %s, got: %s.", pod.Name, image, podImage) framework.Logf("Wrong image for pod: %s. Expected: %s, got: %s.", pod.Name, image, podImage)
} else {
nodesToUpdatedPodCount[pod.Spec.NodeName] += 1
} }
if !podutil.IsPodAvailable(&pod, ds.Spec.MinReadySeconds, metav1.Now()) { if !podutil.IsPodAvailable(&pod, ds.Spec.MinReadySeconds, metav1.Now()) {
framework.Logf("Pod %s is not available", pod.Name) framework.Logf("Pod %s is not available", pod.Name)
@ -742,9 +748,13 @@ func checkDaemonPodsImageAndAvailability(c clientset.Interface, ds *extensions.D
if unavailablePods > maxUnavailable { if unavailablePods > maxUnavailable {
return false, fmt.Errorf("number of unavailable pods: %d is greater than maxUnavailable: %d", unavailablePods, maxUnavailable) return false, fmt.Errorf("number of unavailable pods: %d is greater than maxUnavailable: %d", unavailablePods, maxUnavailable)
} }
if !allImagesUpdated { // Make sure every daemon pod on the node has been updated
nodeNames := schedulableNodes(c, ds)
for _, node := range nodeNames {
if nodesToUpdatedPodCount[node] == 0 {
return false, nil return false, nil
} }
}
return true, nil return true, nil
} }
} }