From bb26c65e8733aced3a408f0c7c9149322e46a798 Mon Sep 17 00:00:00 2001
From: Paul Brookes <paul@turintech.ai>
Date: Sat, 1 Nov 2025 19:22:06 +0000
Subject: [PATCH] test(kubectl): migrate from deprecated NewSimpleClientset to
 NewClientset

Replace fake.NewSimpleClientset() with fake.NewClientset() in kubectl
test files. NewClientset provides field management support for better
Server-Side Apply testing.
---
 staging/src/k8s.io/kubectl/pkg/drain/default_test.go          | 2 +-
 staging/src/k8s.io/kubectl/pkg/drain/drain_test.go            | 4 ++--
 .../src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go | 4 ++--
 .../kubectl/pkg/polymorphichelpers/logsforobject_test.go      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/staging/src/k8s.io/kubectl/pkg/drain/default_test.go b/staging/src/k8s.io/kubectl/pkg/drain/default_test.go
index de7067197a0..648b5e49bf4 100644
--- a/staging/src/k8s.io/kubectl/pkg/drain/default_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/drain/default_test.go
@@ -38,7 +38,7 @@ func TestRunCordonOrUncordon(t *testing.T) {
 		{
 			description: "nil context object",
 			drainer: &Helper{
-				Client: fake.NewSimpleClientset(),
+				Client: fake.NewClientset(),
 			},
 			desired:       true,
 			expectedError: &nilContextError,
diff --git a/staging/src/k8s.io/kubectl/pkg/drain/drain_test.go b/staging/src/k8s.io/kubectl/pkg/drain/drain_test.go
index 373241054b6..79cebb743a9 100644
--- a/staging/src/k8s.io/kubectl/pkg/drain/drain_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/drain/drain_test.go
@@ -293,7 +293,7 @@ func TestCheckEvictionSupport(t *testing.T) {
 	for _, evictionVersion := range []string{"", "v1", "v1beta1"} {
 		t.Run(fmt.Sprintf("evictionVersion=%v", evictionVersion),
 			func(t *testing.T) {
-				k := fake.NewSimpleClientset()
+				k := fake.NewClientset()
 				if len(evictionVersion) > 0 {
 					addEvictionSupport(t, k, evictionVersion)
 				} else {
@@ -411,7 +411,7 @@ func TestDeleteOrEvict(t *testing.T) {
 			}
 
 			// Build the fake client
-			k := fake.NewSimpleClientset(create...)
+			k := fake.NewClientset(create...)
 			if tc.evictionSupported {
 				addEvictionSupport(t, k, "v1")
 			} else {
diff --git a/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go
index 76628cf6312..bb5393d6376 100644
--- a/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go
@@ -91,7 +91,7 @@ func TestGetPodList(t *testing.T) {
 
 	for i := range tests {
 		test := tests[i]
-		fake := fakeexternal.NewSimpleClientset(test.podList)
+		fake := fakeexternal.NewClientset(test.podList)
 		if len(test.watching) > 0 {
 			watcher := watch.NewFake()
 			for _, event := range test.watching {
@@ -251,7 +251,7 @@ func TestGetFirstPod(t *testing.T) {
 
 	for i := range tests {
 		test := tests[i]
-		fake := fakeexternal.NewSimpleClientset(test.podList)
+		fake := fakeexternal.NewClientset(test.podList)
 		if len(test.watching) > 0 {
 			watcher := watch.NewFake()
 			for _, event := range test.watching {
diff --git a/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject_test.go
index d2ded0d895f..9d6e15ea62e 100644
--- a/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject_test.go
@@ -387,7 +387,7 @@ func TestLogsForObject(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		fakeClientset := fakeexternal.NewSimpleClientset(test.clientsetPods...)
+		fakeClientset := fakeexternal.NewClientset(test.clientsetPods...)
 		responses, err := logsForObjectWithClient(fakeClientset.CoreV1(), test.obj, test.opts, 20*time.Second, test.allContainers, test.allPods)
 		if test.expectedErr == "" && err != nil {
 			t.Errorf("%s: unexpected error: %v", test.name, err)
@@ -565,7 +565,7 @@ func TestLogsForObjectWithClient(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			pod := tc.podFn()
-			fakeClientset := fakeexternal.NewSimpleClientset(pod)
+			fakeClientset := fakeexternal.NewClientset(pod)
 			responses, err := logsForObjectWithClient(fakeClientset.CoreV1(), pod, tc.podLogOptions, 20*time.Second, tc.allContainers, tc.allPods)
 			if err != nil {
 				if len(tc.expectedError) > 0 {