Merge pull request #112953 from tkashem/fix-typo
apiserver: fix typo in graceful termination test Kubernetes-commit: 44e33fd74b3f42d9fbc5c2cd658c5601d55e260b
This commit is contained in:
commit
9768ba70d8
4
go.mod
4
go.mod
|
|
@ -44,7 +44,7 @@ require (
|
|||
gopkg.in/square/go-jose.v2 v2.2.2
|
||||
k8s.io/api v0.0.0-20221012115127-0184bd884c5e
|
||||
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef
|
||||
k8s.io/client-go v0.0.0-20221017195518-9cc33a48a716
|
||||
k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640
|
||||
k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb
|
||||
k8s.io/klog/v2 v2.80.1
|
||||
k8s.io/kms v0.0.0-20221014080727-25ac69204108
|
||||
|
|
@ -124,7 +124,7 @@ require (
|
|||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20221012115127-0184bd884c5e
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20221017195518-9cc33a48a716
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb
|
||||
k8s.io/kms => k8s.io/kms v0.0.0-20221014080727-25ac69204108
|
||||
)
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -986,8 +986,8 @@ k8s.io/api v0.0.0-20221012115127-0184bd884c5e h1:N2+121lkGMNfLeos4/AlwuujPJd5xJf
|
|||
k8s.io/api v0.0.0-20221012115127-0184bd884c5e/go.mod h1:Q2jmki3lhHeeAyYtbIiEe/2JoGg2Ge1cJoMgpFkjtzg=
|
||||
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef h1:4lKLUMgwg9xi0UV4qjwS2NHmxBU2llLMdfO7czD9gUg=
|
||||
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef/go.mod h1:/x4E+/xaA5ap3q0tWNh5IPFt63dzY1I2qP8zT4sr5Yg=
|
||||
k8s.io/client-go v0.0.0-20221017195518-9cc33a48a716 h1:FExHRPYu5rkcGBFKPmQxH4x2qD2Qot04O/hcFTqmupk=
|
||||
k8s.io/client-go v0.0.0-20221017195518-9cc33a48a716/go.mod h1:r+Jiu2RH1zXcJsmml1qRHg9oBq4sHHcMRaiEV0GN0ME=
|
||||
k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640 h1:NBR6De5c0hN5LUmjNrE4Y06uDawa8fcMJZejh/XYyGs=
|
||||
k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640/go.mod h1:r+Jiu2RH1zXcJsmml1qRHg9oBq4sHHcMRaiEV0GN0ME=
|
||||
k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb h1:xi+Q1olbNRt1UKQO/NTBEwCql1vBI7y48dUACoSnYMc=
|
||||
k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb/go.mod h1:C6bKv2+Cn5xLxGAlDAFSkSqGtDiPEUrEA4y0BKdUO2I=
|
||||
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func (w *wrappedLifecycleSignal) Signal() {
|
|||
}
|
||||
}
|
||||
|
||||
func wrapLifecycleSignalsWithRecorer(t *testing.T, signals *lifecycleSignals, before func(lifecycleSignal)) {
|
||||
func wrapLifecycleSignalsWithRecorder(t *testing.T, signals *lifecycleSignals, before func(lifecycleSignal)) {
|
||||
// it's important to record the signal being fired on a 'before' callback
|
||||
// to avoid flakes, since on the server the signaling of events are
|
||||
// an asynchronous process.
|
||||
|
|
@ -124,7 +124,7 @@ func newSignalInterceptingTestStep() *signalInterceptingTestStep {
|
|||
// described in the following diagram
|
||||
// - every vertical line is an independent timeline
|
||||
// - the leftmost vertical line represents the go routine that
|
||||
// is executing GenericAPIServer.Run methos
|
||||
// is executing GenericAPIServer.Run method
|
||||
// - (signal name) indicates that the given lifecycle signal has been fired
|
||||
//
|
||||
// stopCh
|
||||
|
|
@ -185,7 +185,7 @@ func TestGracefulTerminationWithKeepListeningDuringGracefulTerminationDisabled(t
|
|||
|
||||
signals := &s.lifecycleSignals
|
||||
recorder := &signalRecorder{}
|
||||
wrapLifecycleSignalsWithRecorer(t, signals, recorder.before)
|
||||
wrapLifecycleSignalsWithRecorder(t, signals, recorder.before)
|
||||
|
||||
// before the AfterShutdownDelayDuration signal is fired, we want
|
||||
// the test to execute a verification step.
|
||||
|
|
@ -393,7 +393,7 @@ func TestGracefulTerminationWithKeepListeningDuringGracefulTerminationEnabled(t
|
|||
|
||||
signals := &s.lifecycleSignals
|
||||
recorder := &signalRecorder{}
|
||||
wrapLifecycleSignalsWithRecorer(t, signals, recorder.before)
|
||||
wrapLifecycleSignalsWithRecorder(t, signals, recorder.before)
|
||||
|
||||
// before the AfterShutdownDelayDuration signal is fired, we want
|
||||
// the test to execute a verification step.
|
||||
|
|
|
|||
Loading…
Reference in New Issue