mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-12 13:31:52 +00:00
Merge pull request #127945 from jpbetz/fix-peerproxy
peerproxy flake: Cancel informers for shutdown server in peerproxy test
This commit is contained in:
commit
c5aa403a98
@ -24,6 +24,7 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
v1 "k8s.io/api/batch/v1"
|
v1 "k8s.io/api/batch/v1"
|
||||||
corev1 "k8s.io/api/core/v1"
|
corev1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
@ -143,7 +144,8 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
// ensure storageversion garbage collector ctlr is set up
|
// ensure storageversion garbage collector ctlr is set up
|
||||||
informersA := informers.NewSharedInformerFactory(kubeClientSetA, time.Second)
|
informersA := informers.NewSharedInformerFactory(kubeClientSetA, time.Second)
|
||||||
setupStorageVersionGC(ctx, kubeClientSetA, informersA)
|
informersACtx, informersACancel := context.WithCancel(ctx)
|
||||||
|
setupStorageVersionGC(informersACtx, kubeClientSetA, informersA)
|
||||||
// reset lease duration to default value for serverB and serverC since we will not be
|
// reset lease duration to default value for serverB and serverC since we will not be
|
||||||
// shutting these down
|
// shutting these down
|
||||||
controlplaneapiserver.IdentityLeaseDurationSeconds = 3600
|
controlplaneapiserver.IdentityLeaseDurationSeconds = 3600
|
||||||
@ -173,6 +175,7 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
|
|||||||
klog.Infof("\nServerA has created jobs\n")
|
klog.Infof("\nServerA has created jobs\n")
|
||||||
|
|
||||||
// shutdown serverA
|
// shutdown serverA
|
||||||
|
informersACancel()
|
||||||
serverA.TearDownFn()
|
serverA.TearDownFn()
|
||||||
|
|
||||||
var jobsB *v1.JobList
|
var jobsB *v1.JobList
|
||||||
|
Loading…
Reference in New Issue
Block a user