Skip to content

[release/1.2] backport: Set octet-stream content-type on put request#4028

Merged
estesp merged 1 commit intocontainerd:release/1.2from
estesp:cp-1.2-4017
Feb 17, 2020
Merged

[release/1.2] backport: Set octet-stream content-type on put request#4028
estesp merged 1 commit intocontainerd:release/1.2from
estesp:cp-1.2-4017

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Feb 14, 2020

Backport #4017 to release/1.2.

Signed-off-by: Josh Dolitsky 393494+jdolitsky@users.noreply.github.com

Zyqsempai
Zyqsempai approved these changes Feb 14, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Feb 16, 2020 

    failed to list container stats for "a4cb85b37d15bd08368e11e4a9615ef7630e4a41d15d89544b71bea0a2b6ceb5" status: rpc error: code = Unknown desc = unexpected metrics response: []
    Unexpected error:
        <*status.statusError | 0xc00034fb30>: {
            Code: 2,
            Message: "unexpected metrics response: []",
            Details: nil,
            XXX_NoUnkeyedLiteral: {},
            XXX_unrecognized: nil,
            XXX_sizecache: 0,
        }
        rpc error: code = Unknown desc = unexpected metrics response: []
    occurred

retesting...

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Feb 16, 2020

CI failure will be fixed by kubernetes-sigs/cri-tools#574

@thaJeztah thaJeztah mentioned this pull request Feb 17, 2020
Merged
5 tasks
@jdolitsky @estesp
Set octet-stream content-type on put request
567ca67 
Signed-off-by: Josh Dolitsky <393494+jdolitsky@users.noreply.github.com>
thaJeztah
thaJeztah approved these changes Feb 17, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link
Copy Markdown

codecov-io commented Feb 17, 2020

Codecov Report

Merging #4028 into release/1.2 will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #4028      +/-   ##
===============================================
- Coverage        44.19%   44.19%   -0.01%     
===============================================
  Files              100      100              
  Lines            10847    10848       +1     
===============================================
  Hits              4794     4794              
- Misses            5313     5314       +1     
  Partials           740      740
Flag Coverage Δ
#linux 47.86% <0%> (-0.01%) ⬇️
#windows 41% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
remotes/docker/pusher.go 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89c46ed...567ca67. Read the comment docs.

@estesp estesp merged commit 1f6ea50 into containerd:release/1.2 Feb 17, 2020
@estesp estesp deleted the cp-1.2-4017 branch February 17, 2020 17:08
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Feb 18, 2020
@thaJeztah
Prepare v1.2.13 release
f141d0f 
The thirteenth patch release for `containerd` 1.2 fixes a regression introduced
in v1.2.12 that caused container/shim to hang on single core machines, fixes an
issue with blkio, and updates the Golang runtime to 1.12.17.

Notable Updates
----------------------------------

* Fix container pid race condition [containerd#4025](containerd#4025)
* Update containerd/cgroups dependency to address blkio issue [containerd#4001](containerd#4001)
* Set octet-stream content-type on PUT request [containerd#4028](containerd#4028)
* Pin to libseccomp 2.3.3 to preserve compatibility with hosts that do not have libseccomp 2.4 or higher installed [containerd#4015](containerd#4015)
* Update Golang runtime to 1.12.17, which includes a fix to the runtime [containerd#4031](containerd#4031)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@andreikom andreikom mentioned this pull request May 13, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

+1 more reviewer

@Zyqsempai Zyqsempai Zyqsempai approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@estesp @fuweid @codecov-io @thaJeztah @Zyqsempai @jdolitsky