From 0c9c7ce40dae5adfd315d203aa80e10daa5c5914 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 9 Jan 2026 16:23:11 +0100 Subject: [PATCH] E2E framework: fix nil pointer crash in TContext Not all framework instances have a default namespace. TContext crashed for those. (cherry picked from commit 80cc14831edefcb889ebaeeb1bddda698415dbc8) This got merged in https://github.com/kubernetes/kubernetes/pull/136140, then reverted in https://github.com/kubernetes/kubernetes/pull/136151 and was not brought back in https://github.com/kubernetes/kubernetes/pull/136156. --- test/e2e/framework/framework.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 1f3a962a6af..33c786277d2 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -187,7 +187,9 @@ func (f *Framework) TContext(ctx context.Context) ktesting.TContext { } tCtx := ktesting.InitCtx(ctx, f /* intentionally using f here and not f.TB because f overrides some methods */) tCtx = tCtx.WithClients(f.clientConfig, f.restMapper, f.ClientSet, f.DynamicClient, apiextensions.NewForConfigOrDie(f.clientConfig)) - tCtx = tCtx.WithNamespace(f.Namespace.Name) + if f.Namespace != nil { + tCtx = tCtx.WithNamespace(f.Namespace.Name) + } tCtx = ensureLogger(tCtx) return tCtx }