Skip to content

Commit 70a2c95

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request containerd#8940 from kiashok/updateShimTag-main
Update hcsshim tag to v0.10.0
2 parents 165f8e4 + a645ff2 commit 70a2c95

74 files changed

Lines changed: 1720 additions & 36415 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/ctr/commands/tasks/metrics.go‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
2828
v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
2929
"github.com/containerd/containerd/cmd/ctr/commands"
30-
"github.com/containerd/containerd/protobuf/proto"
3130
"github.com/containerd/typeurl/v2"
3231
"github.com/urfave/cli"
3332
)
@@ -154,22 +153,8 @@ func printCgroup2MetricsTable(w *tabwriter.Writer, data *v2.Metrics) {
154153

155154
func printWindowsStats(w *tabwriter.Writer, windowsStats *wstats.Statistics) error {
156155
if windowsStats.GetLinux() != nil {
157-
var stats v1.Metrics
158-
159-
// It cannot be casted to v1.Metrics since windowsStats is still generated by gogo/protobuf.
160-
linux := windowsStats.GetLinux()
161-
162-
// But Marshal/Unmarshal works because the underlying protobuf message is compatible.
163-
data, err := linux.Marshal()
164-
if err != nil {
165-
return err
166-
}
167-
err = proto.Unmarshal(data, &stats)
168-
if err != nil {
169-
return err
170-
}
171-
172-
printCgroupMetricsTable(w, &stats)
156+
stats := windowsStats.GetLinux()
157+
printCgroupMetricsTable(w, stats)
173158
} else if windowsStats.GetWindows() != nil {
174159
printWindowsContainerStatistics(w, windowsStats.GetWindows())
175160
}

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // replaced; see replace rules for actual version used.
88
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0
99
github.com/Microsoft/go-winio v0.6.1
10-
github.com/Microsoft/hcsshim v0.10.0-rc.9
10+
github.com/Microsoft/hcsshim v0.10.0
1111
github.com/container-orchestrated-devices/container-device-interface v0.6.0
1212
github.com/containerd/btrfs/v2 v2.0.0
1313
github.com/containerd/cgroups/v3 v3.0.2
@@ -86,7 +86,6 @@ require (
8686
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
8787
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8888
github.com/cilium/ebpf v0.9.1 // indirect
89-
github.com/containerd/cgroups v1.1.0 // indirect
9089
github.com/containerd/typeurl v1.0.2 // indirect
9190
github.com/containers/ocicrypt v1.1.6 // indirect
9291
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
@@ -96,7 +95,6 @@ require (
9695
github.com/godbus/dbus/v5 v5.1.0 // indirect
9796
github.com/gogo/protobuf v1.3.2 // indirect
9897
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
99-
github.com/golang/mock v1.6.0 // indirect
10098
github.com/golang/protobuf v1.5.3 // indirect
10199
github.com/google/gofuzz v1.2.0 // indirect
102100
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwT
9191
github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
9292
github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
9393
github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
94-
github.com/Microsoft/hcsshim v0.10.0-rc.9 h1:B4mguSolFL2yOHl0JjQxo0Si2Vwipj/Cbib4pyJ4pKA=
95-
github.com/Microsoft/hcsshim v0.10.0-rc.9/go.mod h1:1g6+xpige+npSTrEkdm8JOZxOjJ9McQiT0JkEpzyZqA=
94+
github.com/Microsoft/hcsshim v0.10.0 h1:PbvoxdUGgXxyirmN5Oncp3POLkxEG5LbWCEBfWmHTGA=
95+
github.com/Microsoft/hcsshim v0.10.0/go.mod h1:3j1trOamcUdi86J5Tr5+1BpqMjSv/QeRWkX2whBF6dY=
9696
github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
9797
github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
9898
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -199,8 +199,6 @@ github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4S
199199
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
200200
github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
201201
github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8=
202-
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
203-
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
204202
github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0=
205203
github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE=
206204
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
@@ -487,7 +485,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
487485
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
488486
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
489487
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
490-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
491488
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
492489
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
493490
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

‎integration/client/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // replaced; see replace rules for actual version used.
7-
github.com/Microsoft/hcsshim v0.10.0-rc.9
7+
github.com/Microsoft/hcsshim v0.10.0
88
github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1
99
github.com/containerd/cgroups/v3 v3.0.2
1010
github.com/containerd/containerd v1.7.0 // see replace; the actual version of containerd is replaced with the code at the root of this repository
@@ -27,7 +27,6 @@ require (
2727
github.com/Microsoft/go-winio v0.6.1 // indirect
2828
github.com/cilium/ebpf v0.9.1 // indirect
2929
github.com/container-orchestrated-devices/container-device-interface v0.6.0 // indirect
30-
github.com/containerd/cgroups v1.1.0 // indirect
3130
github.com/containerd/console v1.0.3 // indirect
3231
github.com/containerd/fifo v1.1.0 // indirect
3332
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -40,7 +39,6 @@ require (
4039
github.com/godbus/dbus/v5 v5.1.0 // indirect
4140
github.com/gogo/protobuf v1.3.2 // indirect
4241
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
43-
github.com/golang/mock v1.6.0 // indirect
4442
github.com/golang/protobuf v1.5.3 // indirect
4543
github.com/google/go-cmp v0.5.9 // indirect
4644
github.com/google/uuid v1.3.0 // indirect

0 commit comments

Comments
 (0)