set the content-type Header when the dynamic client sends the request

Kubernetes-commit: 2ad09c6a87b9150598c6119d653acc983c5c7a11
This commit is contained in:
scott 2021-08-12 20:17:07 +08:00 committed by Kubernetes Publisher
parent 7697067af7
commit 61ae14a896
2 changed files with 25 additions and 0 deletions

View File

@ -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) 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) w.Header().Set("Content-Type", runtime.ContentTypeJSON)
unstructured.UnstructuredJSONScheme.Encode(statusOK, w) 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) 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) w.Header().Set("Content-Type", runtime.ContentTypeJSON)
unstructured.UnstructuredJSONScheme.Encode(statusOK, w) 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) 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) w.Header().Set("Content-Type", runtime.ContentTypeJSON)
data, err := ioutil.ReadAll(r.Body) data, err := ioutil.ReadAll(r.Body)
if err != nil { 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) 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) w.Header().Set("Content-Type", runtime.ContentTypeJSON)
data, err := ioutil.ReadAll(r.Body) data, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {

View File

@ -110,6 +110,7 @@ func (c *dynamicResourceClient) Create(ctx context.Context, obj *unstructured.Un
result := c.client.client. result := c.client.client.
Post(). Post().
AbsPath(append(c.makeURLSegments(name), subresources...)...). AbsPath(append(c.makeURLSegments(name), subresources...)...).
SetHeader("Content-Type", runtime.ContentTypeJSON).
Body(outBytes). Body(outBytes).
SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Do(ctx) Do(ctx)
@ -145,6 +146,7 @@ func (c *dynamicResourceClient) Update(ctx context.Context, obj *unstructured.Un
result := c.client.client. result := c.client.client.
Put(). Put().
AbsPath(append(c.makeURLSegments(name), subresources...)...). AbsPath(append(c.makeURLSegments(name), subresources...)...).
SetHeader("Content-Type", runtime.ContentTypeJSON).
Body(outBytes). Body(outBytes).
SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Do(ctx) Do(ctx)
@ -181,6 +183,7 @@ func (c *dynamicResourceClient) UpdateStatus(ctx context.Context, obj *unstructu
result := c.client.client. result := c.client.client.
Put(). Put().
AbsPath(append(c.makeURLSegments(name), "status")...). AbsPath(append(c.makeURLSegments(name), "status")...).
SetHeader("Content-Type", runtime.ContentTypeJSON).
Body(outBytes). Body(outBytes).
SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Do(ctx) Do(ctx)
@ -211,6 +214,7 @@ func (c *dynamicResourceClient) Delete(ctx context.Context, name string, opts me
result := c.client.client. result := c.client.client.
Delete(). Delete().
AbsPath(append(c.makeURLSegments(name), subresources...)...). AbsPath(append(c.makeURLSegments(name), subresources...)...).
SetHeader("Content-Type", runtime.ContentTypeJSON).
Body(deleteOptionsByte). Body(deleteOptionsByte).
Do(ctx) Do(ctx)
return result.Error() return result.Error()
@ -225,6 +229,7 @@ func (c *dynamicResourceClient) DeleteCollection(ctx context.Context, opts metav
result := c.client.client. result := c.client.client.
Delete(). Delete().
AbsPath(c.makeURLSegments("")...). AbsPath(c.makeURLSegments("")...).
SetHeader("Content-Type", runtime.ContentTypeJSON).
Body(deleteOptionsByte). Body(deleteOptionsByte).
SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1). SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1).
Do(ctx) Do(ctx)