Skip to content

K
k3s
Commit 936297c6 authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Networking e2es: Wait for all nodes to be schedulable in kubeproxy and networking tests

Now that GCE routes take an extremely long time to come up and there's a variance in "Ready" and "Schedulable", start cherry-picking tests where we really want to have all nodes routable/schedulable for testing. Adding logging. This will increase test times on large clusters but should have 0 impact on normal testing.
parent 7476d977
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
test/e2e/framework/util.go
View file @ 936297c6
...@@ -2623,7 +2623,7 @@ func GetReadySchedulableNodesOrDie(c *client.Client) (nodes *api.NodeList) { ...@@ -2623,7 +2623,7 @@ func GetReadySchedulableNodesOrDie(c *client.Client) (nodes *api.NodeList) {
} }
func WaitForAllNodesSchedulable(c *client.Client) error { func WaitForAllNodesSchedulable(c *client.Client) error {
return wait.PollImmediate(30*time.Second, 2*time.Hour, func() (bool, error) { return wait.PollImmediate(30*time.Second, 4*time.Hour, func() (bool, error) {
opts := api.ListOptions{ opts := api.ListOptions{
ResourceVersion: "0", ResourceVersion: "0",
FieldSelector: fields.Set{"spec.unschedulable": "false"}.AsSelector(), FieldSelector: fields.Set{"spec.unschedulable": "false"}.AsSelector(),
...@@ -2634,11 +2634,16 @@ func WaitForAllNodesSchedulable(c *client.Client) error { ...@@ -2634,11 +2634,16 @@ func WaitForAllNodesSchedulable(c *client.Client) error {
// Ignore the error here - it will be retried. // Ignore the error here - it will be retried.
return false, nil return false, nil
} }
schedulable := 0
for _, node := range nodes.Items { for _, node := range nodes.Items {
if !isNodeSchedulable(&node) { if isNodeSchedulable(&node) {
return false, nil schedulable++
} }
} }
if schedulable != len(nodes.Items) {
Logf("%d/%d nodes schedulable (polling after 30s)", schedulable, len(nodes.Items))
return false, nil
}
return true, nil return true, nil
}) })
} }
......
test/e2e/kubeproxy.go
View file @ 936297c6
...@@ -463,6 +463,7 @@ func (config *KubeProxyTestConfig) setup() { ...@@ -463,6 +463,7 @@ func (config *KubeProxyTestConfig) setup() {
} }
By("Getting node addresses") By("Getting node addresses")
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(config.f.Client))
nodeList := framework.GetReadySchedulableNodesOrDie(config.f.Client) nodeList := framework.GetReadySchedulableNodesOrDie(config.f.Client)
config.externalAddrs = framework.NodeAddresses(nodeList, api.NodeExternalIP) config.externalAddrs = framework.NodeAddresses(nodeList, api.NodeExternalIP)
if len(config.externalAddrs) < 2 { if len(config.externalAddrs) < 2 {
...@@ -501,6 +502,7 @@ func (config *KubeProxyTestConfig) cleanup() { ...@@ -501,6 +502,7 @@ func (config *KubeProxyTestConfig) cleanup() {
} }
func (config *KubeProxyTestConfig) createNetProxyPods(podName string, selector map[string]string) []*api.Pod { func (config *KubeProxyTestConfig) createNetProxyPods(podName string, selector map[string]string) []*api.Pod {
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(config.f.Client))
nodes := framework.GetReadySchedulableNodesOrDie(config.f.Client) nodes := framework.GetReadySchedulableNodesOrDie(config.f.Client)
// create pods, one for each node // create pods, one for each node
......
test/e2e/networking.go
View file @ 936297c6
...@@ -111,6 +111,7 @@ var _ = framework.KubeDescribe("Networking", func() { ...@@ -111,6 +111,7 @@ var _ = framework.KubeDescribe("Networking", func() {
By("Creating a webserver (pending) pod on each node") By("Creating a webserver (pending) pod on each node")
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(f.Client))
nodes := framework.GetReadySchedulableNodesOrDie(f.Client) nodes := framework.GetReadySchedulableNodesOrDie(f.Client)
if len(nodes.Items) == 1 { if len(nodes.Items) == 1 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment