diff --git a/dynamic/client_test.go b/dynamic/client_test.go index a205514d..979d7fe3 100644 --- a/dynamic/client_test.go +++ b/dynamic/client_test.go @@ -275,6 +275,11 @@ func TestDelete(t *testing.T) { t.Errorf("Delete(%q) got path %s. wanted %s", tc.name, r.URL.Path, tc.path) } + content := r.Header.Get("Content-Type") + if content != runtime.ContentTypeJSON { + t.Errorf("Delete(%q) got Content-Type %s. wanted %s", tc.name, content, runtime.ContentTypeJSON) + } + w.Header().Set("Content-Type", runtime.ContentTypeJSON) unstructured.UnstructuredJSONScheme.Encode(statusOK, w) }) @@ -323,6 +328,11 @@ func TestDeleteCollection(t *testing.T) { t.Errorf("DeleteCollection(%q) got path %s. wanted %s", tc.name, r.URL.Path, tc.path) } + content := r.Header.Get("Content-Type") + if content != runtime.ContentTypeJSON { + t.Errorf("DeleteCollection(%q) got Content-Type %s. wanted %s", tc.name, content, runtime.ContentTypeJSON) + } + w.Header().Set("Content-Type", runtime.ContentTypeJSON) unstructured.UnstructuredJSONScheme.Encode(statusOK, w) }) @@ -389,6 +399,11 @@ func TestCreate(t *testing.T) { t.Errorf("Create(%q) got path %s. wanted %s", tc.name, r.URL.Path, tc.path) } + content := r.Header.Get("Content-Type") + if content != runtime.ContentTypeJSON { + t.Errorf("Create(%q) got Content-Type %s. wanted %s", tc.name, content, runtime.ContentTypeJSON) + } + w.Header().Set("Content-Type", runtime.ContentTypeJSON) data, err := ioutil.ReadAll(r.Body) if err != nil { @@ -466,6 +481,11 @@ func TestUpdate(t *testing.T) { t.Errorf("Update(%q) got path %s. wanted %s", tc.name, r.URL.Path, tc.path) } + content := r.Header.Get("Content-Type") + if content != runtime.ContentTypeJSON { + t.Errorf("Uppdate(%q) got Content-Type %s. wanted %s", tc.name, content, runtime.ContentTypeJSON) + } + w.Header().Set("Content-Type", runtime.ContentTypeJSON) data, err := ioutil.ReadAll(r.Body) if err != nil { diff --git a/dynamic/simple.go b/dynamic/simple.go index 9ae320d3..65f40fe1 100644 --- a/dynamic/simple.go +++ b/dynamic/simple.go @@ -110,6 +110,7 @@ func (c *dynamicResourceClient) Create(ctx context.Context, obj *unstructured.Un result := c.client.client. Post(). AbsPath(append(c.makeURLSegments(name), subresources...)...). + SetHeader("Content-Type", runtime.ContentTypeJSON). Body(outBytes). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). Do(ctx) @@ -145,6 +146,7 @@ func (c *dynamicResourceClient) Update(ctx context.Context, obj *unstructured.Un result := c.client.client. Put(). AbsPath(append(c.makeURLSegments(name), subresources...)...). + SetHeader("Content-Type", runtime.ContentTypeJSON). Body(outBytes). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). Do(ctx) @@ -181,6 +183,7 @@ func (c *dynamicResourceClient) UpdateStatus(ctx context.Context, obj *unstructu result := c.client.client. Put(). AbsPath(append(c.makeURLSegments(name), "status")...). + SetHeader("Content-Type", runtime.ContentTypeJSON). Body(outBytes). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). Do(ctx) @@ -211,6 +214,7 @@ func (c *dynamicResourceClient) Delete(ctx context.Context, name string, opts me result := c.client.client. Delete(). AbsPath(append(c.makeURLSegments(name), subresources...)...). + SetHeader("Content-Type", runtime.ContentTypeJSON). Body(deleteOptionsByte). Do(ctx) return result.Error() @@ -225,6 +229,7 @@ func (c *dynamicResourceClient) DeleteCollection(ctx context.Context, opts metav result := c.client.client. Delete(). AbsPath(c.makeURLSegments("")...). + SetHeader("Content-Type", runtime.ContentTypeJSON). Body(deleteOptionsByte). SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1). Do(ctx) diff --git a/go.mod b/go.mod index 2274f484..206b2fc6 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac google.golang.org/protobuf v1.26.0 k8s.io/api v0.0.0-20211008163859-2a5dae08c42b - k8s.io/apimachinery v0.0.0-20211011000437-91117332e378 + k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be k8s.io/klog/v2 v2.20.0 k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b @@ -41,5 +41,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20211008163859-2a5dae08c42b - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211011000437-91117332e378 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be ) diff --git a/go.sum b/go.sum index 47946d23..3725cdbd 100644 --- a/go.sum +++ b/go.sum @@ -601,8 +601,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20211008163859-2a5dae08c42b h1:Nz70nzsUXXw2WjuESe7doPFLamYCkuqPr0h4WNULijE= k8s.io/api v0.0.0-20211008163859-2a5dae08c42b/go.mod h1:uigk499NtRe0ine9Jz9mxVwAjascSPD/Ojn9xYSyB58= -k8s.io/apimachinery v0.0.0-20211011000437-91117332e378 h1:68nXOP1wny9Hqo4ZRpk4dEZUBnaQAwE7jjzkVxm2/oE= -k8s.io/apimachinery v0.0.0-20211011000437-91117332e378/go.mod h1:RAdi3McqM+9tkYHOyceb4XOeJWm9BCAF4BhZki5iiok= +k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be h1:yVOgSJyvwB2pSZxoB0z0V/w1OMbxOQLIz1JzoWL1gzQ= +k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be/go.mod h1:RAdi3McqM+9tkYHOyceb4XOeJWm9BCAF4BhZki5iiok= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.20.0 h1:tlyxlSvd63k7axjhuchckaRJm+a92z5GSOrTOQY5sHw=