From f1d9ba91c7d2496cd39fe819b9b04c58b1676255 Mon Sep 17 00:00:00 2001
From: dhruv7539 <dhruvbhanderi7@gmail.com>
Date: Mon, 23 Feb 2026 10:35:50 -0800
Subject: [PATCH] client-go: keep fake pod log action compatible

Kubernetes-commit: 60c697419d2695108a054d704334778e3d945a6c
---
 .../typed/core/v1/fake/fake_pod_expansion.go  | 29 ++++---------------
 .../core/v1/fake/fake_pod_expansion_test.go   | 13 ++++-----
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/kubernetes/typed/core/v1/fake/fake_pod_expansion.go b/kubernetes/typed/core/v1/fake/fake_pod_expansion.go
index 7e3560b94..74afdb2a0 100644
--- a/kubernetes/typed/core/v1/fake/fake_pod_expansion.go
+++ b/kubernetes/typed/core/v1/fake/fake_pod_expansion.go
@@ -56,30 +56,13 @@ func (c *fakePods) GetBinding(name string) (result *v1.Binding, err error) {
 	return obj.(*v1.Binding), err
 }
 
-// getPodLogsActionImpl carries the standard get action shape (including pod name)
-// along with pod log options so reactors can inspect both.
-type getPodLogsActionImpl struct {
-	core.GetActionImpl
-	Value interface{}
-}
-
-func (a getPodLogsActionImpl) GetValue() interface{} {
-	return a.Value
-}
-
-func (a getPodLogsActionImpl) DeepCopy() core.Action {
-	return getPodLogsActionImpl{
-		GetActionImpl: a.GetActionImpl.DeepCopy().(core.GetActionImpl),
-		// Keep existing fake GenericAction semantics for value copying.
-		Value: a.Value,
-	}
-}
-
 func (c *fakePods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request {
-	action := getPodLogsActionImpl{
-		GetActionImpl: core.NewGetSubresourceAction(c.Resource(), c.Namespace(), "log", name),
-		Value:         opts,
-	}
+	action := core.GenericActionImpl{}
+	action.Verb = "get"
+	action.Namespace = c.Namespace()
+	action.Resource = c.Resource()
+	action.Subresource = "log"
+	action.Value = opts
 
 	obj, err := c.Fake.Invokes(action, &runtime.Unknown{Raw: []byte("fake logs")})
 	logs := []byte("fake logs")
diff --git a/kubernetes/typed/core/v1/fake/fake_pod_expansion_test.go b/kubernetes/typed/core/v1/fake/fake_pod_expansion_test.go
index ec3f89b47..36fde1fe7 100644
--- a/kubernetes/typed/core/v1/fake/fake_pod_expansion_test.go
+++ b/kubernetes/typed/core/v1/fake/fake_pod_expansion_test.go
@@ -54,13 +54,6 @@ func TestFakePodsGetLogsReactorError(t *testing.T) {
 	fp := newFakePods(&FakeCoreV1{Fake: fake}, "default")
 	expectedErr := errors.New("reactor get logs failure")
 	fake.PrependReactor("get", "pods/log", func(action cgtesting.Action) (bool, runtime.Object, error) {
-		getAction, ok := action.(cgtesting.GetAction)
-		if !ok {
-			t.Fatalf("expected GetAction, got %T", action)
-		}
-		if getAction.GetName() != "foo" {
-			t.Fatalf("expected pod name foo, got %q", getAction.GetName())
-		}
 		genericAction, ok := action.(cgtesting.GenericAction)
 		if !ok {
 			t.Fatalf("expected GenericAction, got %T", action)
@@ -95,7 +88,11 @@ func TestFakePodsGetLogsReactorResponse(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Stream pod logs: %v", err)
 	}
-	defer body.Close()
+	defer func() {
+		if err := body.Close(); err != nil {
+			t.Fatalf("Close response body: %v", err)
+		}
+	}()
 
 	logs, err := io.ReadAll(body)
 	if err != nil {