github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136909 from shwetha-s-poojary/fix_flake_TestWebhookConversion_WhitespaceCABundleEtcdBypass

Browse Source 
test: fix the flaking TestWebhookConversion_WhitespaceCABundleEtcdBypass
This commit is contained in:
Kubernetes Prow Robot
2026-02-12 20:30:01 +05:30
committed by GitHub
parent fef67434a6 019f68be5c
commit 096a581c9c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go
View File

@@ -1541,11 +1541,10 @@ func servedVersions(versions []apiextensionsv1.CustomResourceDefinitionVersion)
func TestWebhookConversion_WhitespaceCABundleEtcdBypass(t *testing.T) {
// Setup server and clients
tearDown, config, options, err := fixtures.StartDefaultServer(t)
apiServerTearDown, config, options, err := fixtures.StartDefaultServer(t)
if err != nil {
t.Fatal(err)
}
defer tearDown()
apiExtensionsClient, err := clientset.NewForConfig(config)
if err != nil {
@@ -1591,11 +1590,17 @@ func TestWebhookConversion_WhitespaceCABundleEtcdBypass(t *testing.T) {
verifyMultiVersionObject(t, "v1beta1", obj)
// Set up webhook conversion
tearDown, webhookClientConfig, err := StartConversionWebhookServer(NewObjectConverterWebhookHandler(t, noopConverter))
webhookTearDown, webhookClientConfig, err := StartConversionWebhookServer(NewObjectConverterWebhookHandler(t, noopConverter))
if err != nil {
t.Fatal(err)
}
defer tearDown()
t.Cleanup(func() {
// Ensure conversion webhook remains available until the apiserver
// and its etcd watches are fully shut down.
apiServerTearDown()
webhookTearDown()
})
crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{
Strategy: apiextensionsv1.WebhookConverter,