From 6595fa40268bc8e7f46dcc28267e5e8b0b1ae493 Mon Sep 17 00:00:00 2001 From: Monis Khan Date: Mon, 19 Aug 2024 10:38:16 -0400 Subject: [PATCH] Fix tests that assume core clients use JSON Signed-off-by: Monis Khan --- cmd/kubelet/app/server_bootstrap_test.go | 10 ++++++---- pkg/controller/controller_utils_test.go | 2 +- pkg/controller/endpoint/endpoints_controller_test.go | 3 ++- staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/kubelet/app/server_bootstrap_test.go b/cmd/kubelet/app/server_bootstrap_test.go index 42c4b090bd1..95c7475e528 100644 --- a/cmd/kubelet/app/server_bootstrap_test.go +++ b/cmd/kubelet/app/server_bootstrap_test.go @@ -73,12 +73,14 @@ func Test_buildClientCertificateManager(t *testing.T) { defer s.Close() config1 := &restclient.Config{ - UserAgent: "FirstClient", - Host: s.URL, + UserAgent: "FirstClient", + Host: s.URL, + ContentConfig: restclient.ContentConfig{ContentType: runtime.ContentTypeJSON}, } config2 := &restclient.Config{ - UserAgent: "SecondClient", - Host: s.URL, + UserAgent: "SecondClient", + Host: s.URL, + ContentConfig: restclient.ContentConfig{ContentType: runtime.ContentTypeJSON}, } nodeName := types.NodeName("test") diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index cbda5d26cfa..ef6f74127af 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -375,7 +375,7 @@ func TestCreatePodsWithGenerateName(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}, ContentType: runtime.ContentTypeJSON}}) podControl := RealPodControl{ KubeClient: clientset, diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 4147d74b2e4..d1c71321e69 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -27,6 +27,7 @@ import ( "time" "github.com/google/go-cmp/cmp" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -225,7 +226,7 @@ type endpointController struct { } func newController(ctx context.Context, url string, batchPeriod time.Duration) *endpointController { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}, ContentType: runtime.ContentTypeJSON}}) informerFactory := informers.NewSharedInformerFactory(client, controllerpkg.NoResyncPeriodFunc()) endpoints := NewEndpointController(ctx, informerFactory.Core().V1().Pods(), informerFactory.Core().V1().Services(), informerFactory.Core().V1().Endpoints(), client, batchPeriod) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go index c0ac3411eef..b49400f6360 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go @@ -161,7 +161,7 @@ func TestRunAccessCheck(t *testing.T) { test.serverErr }), } - tf.ClientConfigVal = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}} + tf.ClientConfigVal = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}, ContentType: runtime.ContentTypeJSON}} if err := test.o.Complete(tf, test.args); err != nil { t.Errorf("%s: %v", test.name, err) @@ -196,6 +196,7 @@ func TestRunAccessList(t *testing.T) { " [/version] [] [get]\n" tf := cmdtesting.NewTestFactory().WithNamespace("test") + tf.ClientConfigVal.ContentType = runtime.ContentTypeJSON defer tf.Cleanup() ns := scheme.Codecs.WithoutConversion()