563 Commits
Author SHA1 Message Date
Justin Terry 5dd94a7e6c Updates oci image config to support upstream ArgsEscaped
ArgsEscaped has now been merged into upstream OCI image spec.
This change removes the workaround we were doing in containerd
to deserialize the extra json outside of the spec and instead
just uses the formal spec types.

Signed-off-by: Justin Terry <jlterry@amazon.com>
(cherry picked from commit d4b9dade13)
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
2023-03-29 10:06:12 -07:00
Derek McGowan 50a6be0b47 Update ttrpc to v1.1.1
Fix fd leak on connection reset

Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-03-24 08:34:08 -07:00
Phil Estes 5a8ea75df7 Update go-restful to v3
Signed-off-by: Phil Estes <estesp@amazon.com>
2023-03-15 12:02:40 -04:00
Sebastiaan van Stijn 59bdc1d5a7 go.mod: update to github.com/emicklei/go-restful/v3 v3.7.3
full diff: https://github.com/emicklei/go-restful/compare/v2.9.5...v3.7.3

- Switch to using go modules
- Add check for wildcard to fix CORS filter
- Add check on writer to prevent compression of response twice
- Add OPTIONS shortcut WebService receiver
- Add Route metadata to request attributes or allow adding attributes to routes
- Add wroteHeader set
- Enable content encoding on Handle and ServeHTTP
- Feat: support google custom verb
- Feature: override list of method allowed without content-type
- Fix Allow header not set on '405: Method Not Allowed' responses
- Fix Go 1.15: conversion from int to string yields a string of one rune
- Fix WriteError return value
- Fix: use request/response resulting from filter chain
- handle path params with prefixes and suffixes
- HTTP response body was broken, if struct to be converted to JSON has boolean value
- List available representations in 406 body
- Support describing response headers
- Unwrap function in filter chain + remove unused dispatchWithFilters

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 481fb923c5)
2023-03-15 11:59:34 -04:00
Kirtana Ashok f488a6241b Update hcsshim tag to v0.9.7
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
2023-02-22 10:37:07 -08:00
Samuel Karp 545f220910 mod: update github.com/pelletier/go-toml@v1.9.5
Signed-off-by: Samuel Karp <samuelkarp@google.com>
(cherry picked from commit 6f9936e305)
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2023-01-09 17:13:26 -08:00
Akihiro Suda 53c733e0ba cri: fix memory.memsw.limit_in_bytes: no such file or directory
Skip automatic `if swapLimit == 0 { s.Linux.Resources.Memory.Swap = &limit }` when the swap controller is missing.
(default on Ubuntu 20.04)

Fix issue 7828 (regression in PR 7783 "cri: make swapping disabled with memory limit")

Cherry-Pick was not cleaned, required updated cgroups library from v1.0.3 to v1.0.4

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 4157503881)
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-12-19 07:53:13 -08:00
Kirtana Ashok ffc16f5562 Bump hcsshim to v0.9.6
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
2022-12-13 13:50:47 -08:00
Kathryn Baldauf df73acad50 [release/1.6] go.mod: Bump hcsshim to v0.9.5
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2022-10-31 17:11:04 -07:00
Kazuyoshi Kato 5b40993a5e [release/1.6] upgrade containerd/continuity from v0.2.2 to v0.3.0
This is a backport of #7028, but not cherry-picked due to conflicts.

Fixes #7054.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-10-12 22:50:35 +00:00
Wei Fu a85709c6c4 integration: simplify CNI-fp and add README.md
* Use delegated plugin call to simplify cni-bridge-cni
* Add README.md for cni-bridge-cni

Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit e6a2c07902)
Signed-off-by: Qiutong Song <songqt01@gmail.com>
2022-09-30 11:48:48 +00:00
Daniel Canter 0007f40fe2 [release/1.6] go.mod: Bump hcsshim to v0.9.4
This tag contains some fixes for hostprocess containers, mainly around
fixing task stats which regressed from a change in v0.9.3.

https://github.com/microsoft/hcsshim/releases/tag/v0.9.4

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-07-26 14:16:28 -07:00
Mike Brown fdcdc27bce update go-cni/for cni update fixing plugins that don't respond with version
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
(cherry picked from commit e3b4d750db)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-06-02 15:25:46 +08:00
Daniel Canter 6eff5b6c0e [release/1.6] go.mod: Bump hcsshim to 0.9.3
This tag brings in a new field to fix an HNS issue in ws2019 as well as
an optimization for collecting Windows stats (memory, cpu, iops).

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-05-20 16:45:42 -07:00
log1cb0mb 42d691fe6b Bump opencontainers/selinux from 1.10.0 to 1.10.1
Signed-off-by: Nabeel Rana <nabeelnrana@gmail.com>
(cherry picked from commit ae29594d0b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-29 09:33:54 +02:00
Michael Zappa e9f22e008b Update go-cni to v1.1.5
Signed-off-by: Michael Zappa <Michael.Zappa@stateless.net>
(cherry picked from commit 5d0730370d)
Signed-off-by: Michael Zappa <Michael.Zappa@stateless.net>
2022-04-28 15:12:06 -06:00
Sebastiaan van Stijn 7ede40c5ca [release/1.6] vendor: github.com/containerd/imgcrypt v1.1.4
- Fixed issue in CheckAuthorization() callpath for images with a ManifestList
  - CVE-2022-24778
  - Fix: https://github.com/containerd/imgcrypt/commit/6fdd9818a4d8142107b7ecd767d839c9707700d9
  - Added test case covering this
- Updated to ocicrypt 1.1.3
- Updated to containerd 1.6.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-25 20:11:17 +01:00
Derek McGowan 264371e065 Merge pull request #6728 from thaJeztah/1.6_backport_update_go_cni_to_v1.1.4
[release/1.6 backport] moving up to go-cni v1.1.4
2022-03-24 10:47:28 -07:00
Phil Estes ad0036ed62 Update prometheus client vendor
Signed-off-by: Phil Estes <estesp@amazon.com>
(cherry picked from commit c568752335)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-24 03:24:54 +01:00
Mike Brown 82a12edf25 moving up to go-cni v1.1.4
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
(cherry picked from commit a51da91c1d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-24 03:10:39 +01:00
Derek McGowan ca51d7f858 Update go.mod go version
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-03-23 16:58:37 -07:00
Derek McGowan fa19714db9 Update go-cni to v1.1.3
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-14 10:37:31 -08:00
Derek McGowan c0f8188469 Update go-cni to v1.1.2
Fixes panic when exec is nil

Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-10 12:40:51 -08:00
Derek McGowan 8d69c041c5 Update cgroups to v1.0.3
Pull in latest cgroups to pick up leak fixes

Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-01 16:57:51 -08:00
Derek McGowan 5089b12100 Merge pull request #6439 from dmcgowan/remove-submodule-go-mod
Remove submodule go mod
2022-01-19 11:20:04 -08:00
Phil Estes 778da8bae9 Merge pull request #6453 from dcantah/bump-hcsshim-0.9.2
go.mod: Update hcsshim to v0.9.2
2022-01-19 08:34:46 -05:00
Daniel Canter af39d2ad71 go.mod: Update hcsshim to v0.9.2
This tag brings in some bug fixes related to waiting for containers to terminate and
trying to kill an already terminated process, as well as tty support (exec -it) for
Windows Host Process Containers.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-01-18 17:34:52 -08:00
Derek McGowan fcb7bd6997 Remove api go submodule
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-01-18 14:48:33 -08:00
Akihiro Suda 21a748e381 go.mod: github.com/opencontainers/runc v1.1.0
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-01-18 13:35:22 +09:00
Derek McGowan 468513820d Merge pull request #6351 from adisky/update-k/k-1.23
Updates CRI API & Kubernetes to 1.23
2022-01-07 15:26:44 -08:00
Akihiro Suda d3724a6c17 go.mod: update github.com/containerd/{continuity,go-cni,imgcrypt}
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-01-07 18:54:15 +09:00
Aditi Sharma e43d4206af Update k/k to 1.23.0
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
2022-01-06 11:18:23 +05:30
Markus Lehtonen eba1048163 Update dependencies
Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
2022-01-04 09:27:54 +02:00
Kazuyoshi Kato 2fb739aa21 Upgrade OpenTelemetry dependencies
This commit upgrades the packages under go.opentelemetry.io/.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-12-16 22:35:57 +00:00
Sebastiaan van Stijn fc8138468f go.mod: update image-spec to latest (v1.0.3-dev)
The OCI image spec did a v1.0.2 security release for CVE-2021-41190, however
commit 09c9270fee, depends on MediaTypes that
have not yet been released by the OCI image-spec, so using current "main" instead.

full diff: https://github.com/opencontainers/image-space/compare/5ad6f50d6283...693428a734f5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-12-09 17:50:09 +01:00
Gabriel Adrian Samfira fd0850e9ef Update continuity dependency
This change ensures that Windows security info is
copied.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-12-03 00:26:45 +02:00
Derek McGowan d055487b00 Merge pull request #6206 from mxpv/path
Allow absolute path to shim binaries
2021-11-15 18:05:48 -08:00
Daniel Canter b103bee4cc go.mod: Bump hcsshim to v0.9.1
This tag contains some changes for the Windows shim for retrying
stdio named pipe connections if containerd restarts. It also is built with v1.1.0 of
ttrpc which has some fixes for a deadlock we'd observed on Windows.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-11-10 16:26:18 -08:00
Daniel Canter 920b24793d go.mod: Bump ttrpc to 1.1.0
This tag contains a fix for a deadlock observed when there are multiple
simultaneous requests from the same client connection.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-11-10 10:20:14 -08:00
Sebastiaan van Stijn 97073c9437 go.mod: github.com/moby/sys/mountinfo v0.5.0
full diff: https://github.com/moby/sys/compare/95edfa939201...mountinfo/v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:10:26 +01:00
Sebastiaan van Stijn 19d9d0d2a5 go.mod: github.com/moby/sys/signal v0.6.0
full diff: https://github.com/moby/sys/compare/8a51b5cc8879...signal/v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:08:07 +01:00
Sebastiaan van Stijn 9c455ded61 go.mod: github.com/moby/sys/symlink v0.2.0
full diff: https://github.com/moby/sys/compare/symlink/v0.1.0...symlink/v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:05:38 +01:00
Maksym Pavlenko d4f4c1380a Add runtime path in CreateTaskRequest
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-11-04 07:33:11 -07:00
David Porter b69bbe25ac Vendor latest k8s.io/cri-api and netlink
* Bump k8s.io/cri-api to latest version - v0.23.0-alpha.4
* Vendor github.com/vishvananda/netlink for network stats

Signed-off-by: David Porter <porterdavid@google.com>
2021-11-03 17:52:05 -07:00
Claudiu Belu 96018b7db9 vendor: Updates go-cni
This update will allow us to forcefully delete a Windows sandbox if its
endpoint cannot be found anymore.

Fixes: #6135

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-10-06 05:35:53 -07:00
Derek McGowan 0d0fb68589 Merge pull request #6149 from ukontainer/vendor-moby-sys
vendor: update moby/sys for darwin support
2021-10-25 15:20:10 -07:00
Hajime Tazaki b8f3ebb03b vendor: update moby/sys for darwin support
The mount package of darwin requires to retrive mountinfo to check if
the target of unmount if still mounted or not.  Thus pull the upstreamed
version of moby/sys to support this operation.

Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
2021-10-23 07:48:17 +09:00
zounengren a217b5ac8f bump CNI to spec v1.0.0
Signed-off-by: zounengren <zouyee1989@gmail.com>
2021-10-22 10:58:40 +08:00
Derek McGowan 18d483b236 Update cgroups to v1.0.2
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-10-08 17:48:33 -07:00
Daniel Canter 46b152f81b vendor: Bump hcsshim to 0.9.0
This change bumps hcsshim to 0.9.0. Main thing this tag contains is support for
Kubernetes Host Process containers
See: https://kubernetes.io/docs/tasks/configure-pod-container/create-hostprocess-pod/

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-10-07 21:00:35 -07:00