Skip to content

Commit 869b786

Browse files
committed
vendor: github.com/containerd/platforms v0.2.1
- Remove hcsshim import from repo - un-exports GetOsVersion - Update windows matcher to not compare empty os version full diff: containerd/platforms@v0.2.0...v0.2.1 Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 87dd430) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 6ccdf69 commit 869b786

7 files changed

Lines changed: 92 additions & 53 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/containerd/imgcrypt v1.1.8
2121
github.com/containerd/log v0.1.0
2222
github.com/containerd/nri v0.6.1
23-
github.com/containerd/platforms v0.2.0
23+
github.com/containerd/platforms v0.2.1
2424
github.com/containerd/ttrpc v1.2.4
2525
github.com/containerd/typeurl/v2 v2.1.1
2626
github.com/containerd/zfs v1.1.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
194194
github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
195195
github.com/containerd/nri v0.6.1 h1:xSQ6elnQ4Ynidm9u49ARK9wRKHs80HCUI+bkXOxV4mA=
196196
github.com/containerd/nri v0.6.1/go.mod h1:7+sX3wNx+LR7RzhjnJiUkFDhn18P5Bg/0VnJ/uXpRJM=
197-
github.com/containerd/platforms v0.2.0 h1:clGNvVIcY3k39VJSYdFGohI1b3bP/eeBUVR5+XA28oo=
198-
github.com/containerd/platforms v0.2.0/go.mod h1:XOM2BS6kN6gXafPLg80V6y/QUib+xoLyC3qVmHzibko=
197+
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
198+
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
199199
github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
200200
github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
201201
github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=

integration/client/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/containerd/errdefs v0.1.0
1313
github.com/containerd/go-runc v1.0.0
1414
github.com/containerd/log v0.1.0
15-
github.com/containerd/platforms v0.2.0
15+
github.com/containerd/platforms v0.2.1
1616
github.com/containerd/ttrpc v1.2.4
1717
github.com/containerd/typeurl/v2 v2.1.1
1818
github.com/google/uuid v1.3.1

integration/client/go.sum

Lines changed: 2 additions & 40 deletions
Large diffs are not rendered by default.

vendor/github.com/containerd/platforms/defaults_windows.go

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/platforms/platform_compat_windows.go

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ github.com/containerd/nri/pkg/net/multiplex
144144
github.com/containerd/nri/pkg/runtime-tools/generate
145145
github.com/containerd/nri/pkg/stub
146146
github.com/containerd/nri/types/v1
147-
# github.com/containerd/platforms v0.2.0
147+
# github.com/containerd/platforms v0.2.1
148148
## explicit; go 1.20
149149
github.com/containerd/platforms
150150
# github.com/containerd/ttrpc v1.2.4

0 commit comments

Comments
 (0)