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

Clear shutdown in replicationcontroller integration test

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-05-11 14:15:16 +02:00
parent c043535250
commit ca68691feb
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
test/integration/replicationcontroller/replicationcontroller_test.go
View File

@ -133,12 +133,12 @@ func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replication.
} }
// Run RC controller and informers // Run RC controller and informers
func runControllerAndInformers(t *testing.T, rm *replication.ReplicationManager, informers informers.SharedInformerFactory, podNum int) chan struct{} { func runControllerAndInformers(t *testing.T, rm *replication.ReplicationManager, informers informers.SharedInformerFactory, podNum int) func() {
stopCh := make(chan struct{}) ctx, cancelFn := context.WithCancel(context.Background())
informers.Start(stopCh) informers.Start(ctx.Done())
waitToObservePods(t, informers.Core().V1().Pods().Informer(), podNum) waitToObservePods(t, informers.Core().V1().Pods().Informer(), podNum)
go rm.Run(context.TODO(), 5) go rm.Run(ctx, 5)
return stopCh return cancelFn
} }
// wait for the podInformer to observe the pods. Call this function before // wait for the podInformer to observe the pods. Call this function before
@ -431,8 +431,8 @@ func TestAdoption(t *testing.T) {
t.Fatalf("Failed to create Pod: %v", err) t.Fatalf("Failed to create Pod: %v", err)
} }
stopCh := runControllerAndInformers(t, rm, informers, 1) stopControllers := runControllerAndInformers(t, rm, informers, 1)
defer close(stopCh) defer stopControllers()
if err := wait.PollImmediate(interval, timeout, func() (bool, error) { if err := wait.PollImmediate(interval, timeout, func() (bool, error) {
updatedPod, err := podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) updatedPod, err := podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{})
if err != nil { if err != nil {
@ -458,8 +458,8 @@ func TestSpecReplicasChange(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t) ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 2) rc := newRC("rc", ns.Name, 2)
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{}) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{})
@ -501,8 +501,8 @@ func TestLogarithmicScaleDown(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t) ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 2) rc := newRC("rc", ns.Name, 2)
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{}) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{})
@ -538,8 +538,8 @@ func TestDeletingAndFailedPods(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", s, t) ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 2) rc := newRC("rc", ns.Name, 2)
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{}) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{})
@ -603,8 +603,8 @@ func TestOverlappingRCs(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-overlapping-rcs", s, t) ns := framework.CreateTestingNamespace("test-overlapping-rcs", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
// Create 2 RCs with identical selectors // Create 2 RCs with identical selectors
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
@ -638,8 +638,8 @@ func TestPodOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-pod-orphaning-and-adoption-when-labels-change", s, t) ns := framework.CreateTestingNamespace("test-pod-orphaning-and-adoption-when-labels-change", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 1) rc := newRC("rc", ns.Name, 1)
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{}) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{})
@ -715,8 +715,8 @@ func TestGeneralPodAdoption(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-general-pod-adoption", s, t) ns := framework.CreateTestingNamespace("test-general-pod-adoption", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 1) rc := newRC("rc", ns.Name, 1)
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{}) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{})
@ -747,8 +747,8 @@ func TestReadyAndAvailableReplicas(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-ready-and-available-replicas", s, t) ns := framework.CreateTestingNamespace("test-ready-and-available-replicas", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 3) rc := newRC("rc", ns.Name, 3)
rc.Spec.MinReadySeconds = 3600 rc.Spec.MinReadySeconds = 3600
@ -799,8 +799,8 @@ func TestRCScaleSubresource(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-rc-scale-subresource", s, t) ns := framework.CreateTestingNamespace("test-rc-scale-subresource", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
rc := newRC("rc", ns.Name, 1) rc := newRC("rc", ns.Name, 1)
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{}) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, []*v1.Pod{})
@ -829,8 +829,8 @@ func TestExtraPodsAdoptionAndDeletion(t *testing.T) {
} }
rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, podList) rcs, _ := createRCsPods(t, c, []*v1.ReplicationController{rc}, podList)
rc = rcs[0] rc = rcs[0]
stopCh := runControllerAndInformers(t, rm, informers, 3) stopControllers := runControllerAndInformers(t, rm, informers, 3)
defer close(stopCh) defer stopControllers()
waitRCStable(t, c, rc) waitRCStable(t, c, rc)
// Verify the extra pod is deleted eventually by determining whether number of // Verify the extra pod is deleted eventually by determining whether number of
@ -850,8 +850,8 @@ func TestFullyLabeledReplicas(t *testing.T) {
defer closeFn() defer closeFn()
ns := framework.CreateTestingNamespace("test-fully-labeled-replicas", s, t) ns := framework.CreateTestingNamespace("test-fully-labeled-replicas", s, t)
defer framework.DeleteTestingNamespace(ns, s, t) defer framework.DeleteTestingNamespace(ns, s, t)
stopCh := runControllerAndInformers(t, rm, informers, 0) stopControllers := runControllerAndInformers(t, rm, informers, 0)
defer close(stopCh) defer stopControllers()
extraLabelMap := map[string]string{"foo": "bar", "extraKey": "extraValue"} extraLabelMap := map[string]string{"foo": "bar", "extraKey": "extraValue"}
rc := newRC("rc", ns.Name, 2) rc := newRC("rc", ns.Name, 2)