Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903 #429

Merged
merged 7 commits into from
Jan 23, 2020
Merged

[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903 #429

merged 7 commits into from
Jan 23, 2020

Commits on Dec 3, 2019

  1. bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9 

    full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0af1099)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    fe00613 View commit details
    Browse the repository at this point in the history

  2. bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a 

    full diff: containerd/cgroups@c4b9ac5...5fbad35

- containerd/cgroups#82 Add go module support
- containerd/cgroups#96 Move metrics proto package to stats/v1
- containerd/cgroups#97 Allow overriding the default /proc folder in blkioController
- containerd/cgroups#98 Allows ignoring memory modules
- containerd/cgroups#99 Add Go 1.13 to Travis
- containerd/cgroups#100 stats/v1: export per-cgroup stats

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 27552ce)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    9ab162a View commit details
    Browse the repository at this point in the history

  3. Rename "v1" to "statsV1" 

    follow-up to 27552ce, where this
was left as a review comment, but the PR was already merged.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 9a7e96b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    4d190af View commit details
    Browse the repository at this point in the history

  4. integration-cli: remove unnescessary conversions (unconvert) 

    Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 7c40c0a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    3fca587 View commit details
    Browse the repository at this point in the history

  5. bump Microsoft/hcsshim 2226e083fc390003ae5aa8325c3c92789afa0e7a 

    Adds osversion.Build() utility

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit a5341aa)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    1f18c73 View commit details
    Browse the repository at this point in the history

  6. TestRunAttachFailedNoLeak: Compare lowercase 

    Fixed failures in TestRunAttachFailedNoLeak caused by case mismatch

Signed-off-by: vikrambirsingh <[email protected]>
(cherry picked from commit c530c9c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    vikrambirsingh authored and thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    5302429 View commit details
    Browse the repository at this point in the history

  7. Bump hcsshim to b3f49c06ffaeef24d09c6c08ec8ec8425a 

    Among other things, this is required to pull in
microsoft/hcsshim#718

Also fixes microsoft/hcsshim#737
which was caught by checks while attempting to bump
up hcsshim version.

Signed-off-by: Vikram bir Singh <[email protected]>
(cherry picked from commit a7b6c3f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    Vikram bir Singh authored and thaJeztah committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    e2f226b View commit details
    Browse the repository at this point in the history