github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93619 from liggitt/node-flake

Browse Source 
Deflake node controller unit tests
This commit is contained in:
Kubernetes Prow Robot 2020-08-01 20:22:41 -07:00 committed by GitHub
commit 09d6512ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/cloud-provider/controllers/node/BUILD
View File

@ -44,6 +44,7 @@ go_test(
"//staging/src/k8s.io/cloud-provider/fake:go_default_library", "//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//vendor/github.com/google/go-cmp/cmp:go_default_library", "//vendor/github.com/google/go-cmp/cmp:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
], ],
) )

14
staging/src/k8s.io/cloud-provider/controllers/node/node_controller_test.go
View File

@ -23,15 +23,16 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
cloudproviderapi "k8s.io/cloud-provider/api" cloudproviderapi "k8s.io/cloud-provider/api"
fakecloud "k8s.io/cloud-provider/fake" fakecloud "k8s.io/cloud-provider/fake"
@ -1293,7 +1294,8 @@ func Test_AddCloudNode(t *testing.T) {
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
} }
eventBroadcaster.StartLogging(t.Logf) w := eventBroadcaster.StartLogging(klog.Infof)
defer w.Stop()
cloudNodeController.AddCloudNode(context.TODO(), test.existingNode) cloudNodeController.AddCloudNode(context.TODO(), test.existingNode)
@ -1371,7 +1373,8 @@ func TestGCEConditionV2(t *testing.T) {
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
} }
eventBroadcaster.StartLogging(t.Logf) w := eventBroadcaster.StartLogging(klog.Infof)
defer w.Stop()
cloudNodeController.AddCloudNode(context.TODO(), existingNode) cloudNodeController.AddCloudNode(context.TODO(), existingNode)
@ -1453,7 +1456,8 @@ func TestGCECondition(t *testing.T) {
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
} }
eventBroadcaster.StartLogging(t.Logf) w := eventBroadcaster.StartLogging(klog.Infof)
defer w.Stop()
cloudNodeController.AddCloudNode(context.TODO(), existingNode) cloudNodeController.AddCloudNode(context.TODO(), existingNode)

6
staging/src/k8s.io/cloud-provider/controllers/nodelifecycle/node_lifecycle_controller_test.go
View File

@ -290,7 +290,8 @@ func Test_NodesDeleted(t *testing.T) {
nodeMonitorPeriod: 1 * time.Second, nodeMonitorPeriod: 1 * time.Second,
} }
eventBroadcaster.StartLogging(t.Logf) w := eventBroadcaster.StartLogging(klog.Infof)
defer w.Stop()
cloudNodeLifecycleController.MonitorNodes() cloudNodeLifecycleController.MonitorNodes()
updatedNode, err := clientset.CoreV1().Nodes().Get(context.TODO(), testcase.existingNode.Name, metav1.GetOptions{}) updatedNode, err := clientset.CoreV1().Nodes().Get(context.TODO(), testcase.existingNode.Name, metav1.GetOptions{})
@ -498,7 +499,8 @@ func Test_NodesShutdown(t *testing.T) {
nodeMonitorPeriod: 1 * time.Second, nodeMonitorPeriod: 1 * time.Second,
} }
eventBroadcaster.StartLogging(klog.Infof) w := eventBroadcaster.StartLogging(klog.Infof)
defer w.Stop()
cloudNodeLifecycleController.MonitorNodes() cloudNodeLifecycleController.MonitorNodes()
updatedNode, err := clientset.CoreV1().Nodes().Get(context.TODO(), testcase.existingNode.Name, metav1.GetOptions{}) updatedNode, err := clientset.CoreV1().Nodes().Get(context.TODO(), testcase.existingNode.Name, metav1.GetOptions{})