improve webhook management during authorizer e2e tests

On-behalf-of: @SAP [email protected]

Author: xrstf

test/e2e/authorizer/authorizationorder_test.go

@@ -53,7 +53,8 @@ func TestAuthorizationOrder(t *testing.T) {
 
 		// stop the webhook and switch to a deny policy
 		webhookStop()
-		RunWebhook(ctx, t, webhookPort, "kubernetes:authz:deny")
+		webhookStop = RunWebhook(ctx, t, webhookPort, "kubernetes:authz:deny")
+		t.Cleanup(webhookStop)
 
 		t.Log("Admin should not be allowed to list ConfigMaps.")
 		_, err = kubeClusterClient.Cluster(logicalcluster.NewPath("root")).CoreV1().ConfigMaps("default").List(ctx, metav1.ListOptions{})
@@ -82,7 +83,8 @@ func TestAuthorizationOrder(t *testing.T) {
 
 		// stop the webhook and switch to a deny policy
 		webhookStop()
-		RunWebhook(ctx, t, webhookPort, "kubernetes:authz:deny")
+		webhookStop = RunWebhook(ctx, t, webhookPort, "kubernetes:authz:deny")
+		t.Cleanup(webhookStop)
 
 		t.Log("Admin should not be allowed now to list Logical clusters.")
 		_, err = kcpClusterClient.Cluster(logicalcluster.NewPath("root")).CoreV1alpha1().LogicalClusters().List(ctx, metav1.ListOptions{})

test/e2e/authorizer/utils.go

@@ -22,6 +22,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"sync"
 	"testing"
 	"time"
 
@@ -66,11 +67,11 @@ func RunWebhook(ctx context.Context, t *testing.T, port string, response string)
 		return true, ""
 	}, wait.ForeverTestTimeout, time.Millisecond*200)
 
-	return func() {
+	return sync.OnceFunc(func() {
 		t.Log("Stopping webhook...")
 		cancel()
-		if err := cmd.Wait(); err != nil {
-			t.Logf("error waiting for webhook to finish: %v", err)
+		if err := cmd.Wait(); err != nil && err.Error() != "signal: killed" {
+			t.Logf("Error waiting for webhook to finish: %v", err)
 		}
-	}
+	})
 }