mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #94880 from knight42/fix/TestRotateShutsDownConnections
test(kubelet): deflake TestRotateShutsDownConnections
This commit is contained in:
commit
c6cdc02998
@ -42,6 +42,7 @@ go_test(
|
|||||||
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
|
||||||
|
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1:go_default_library",
|
"//staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/rest:go_default_library",
|
"//staging/src/k8s.io/client-go/rest:go_default_library",
|
||||||
],
|
],
|
||||||
|
@ -30,6 +30,7 @@ import (
|
|||||||
|
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
"k8s.io/apimachinery/pkg/runtime/serializer"
|
"k8s.io/apimachinery/pkg/runtime/serializer"
|
||||||
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
|
certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
|
||||||
"k8s.io/client-go/rest"
|
"k8s.io/client-go/rest"
|
||||||
)
|
)
|
||||||
@ -208,14 +209,16 @@ func TestRotateShutsDownConnections(t *testing.T) {
|
|||||||
// its connections to the server.
|
// its connections to the server.
|
||||||
m.setCurrent(client2CertData.certificate)
|
m.setCurrent(client2CertData.certificate)
|
||||||
|
|
||||||
for i := 0; i < 5; i++ {
|
err = wait.PollImmediate(time.Millisecond*50, wait.ForeverTestTimeout, func() (done bool, err error) {
|
||||||
time.Sleep(time.Millisecond * 10)
|
|
||||||
client.Get().Do(context.TODO())
|
client.Get().Do(context.TODO())
|
||||||
if firstCertSerial.Cmp(lastSerialNumber()) != 0 {
|
if firstCertSerial.Cmp(lastSerialNumber()) != 0 {
|
||||||
// The certificate changed!
|
// The certificate changed!
|
||||||
return
|
return true, nil
|
||||||
}
|
}
|
||||||
|
t.Logf("Certificate not changed, will retry.")
|
||||||
|
return false, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("certificate rotated but client never reconnected with new cert")
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Errorf("certificate rotated but client never reconnected with new cert")
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user