github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,724 Commits 3 Branches 2 Tags 112 MiB
a68f9b7c56
Commit Graph

13724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Brown
a68f9b7c56
Merge pull request #9419 from ChengyuZhu6/pause_image 
cri: add sandbox image name to annotations
 2024-04-09 15:52:04 +00:00
ChengyuZhu6
b6e3616949 cri: add pause image name to annotations 
We are currently in the process of developing a feature to facilitate guest image pulling
on confidential-containers, and we would be grateful for containerd's support in this endeavor.
It would greatly assist our efforts if containerd could provide the pause image name and
add it into the annotations.

Fixes: #9418

Signed-off-by: ChengyuZhu6 <chengyu.zhu@intel.com>
 2024-04-09 22:33:58 +08:00
Mike Brown
406e9e84b4
Merge pull request #9415 from kiashok/fixIntegrationClientAddr 
Use different containerd sock address for integration test client
 2024-04-08 22:58:33 +00:00
Maksym Pavlenko
454bd58a27
Merge pull request #10031 from ktock/fail-plain-http-2.0 
remote: Fix HTTPFallback fails when pushing manifest
 2024-04-07 03:35:19 +00:00
Phil Estes
d29df16c75
Merge pull request #7807 from swagatbora90/tracing-documentation-update 
Update tracing documentation to add details about manual instrumentation
 2024-04-05 14:32:47 -04:00
Phil Estes
ac8f7698cf
Merge pull request #9999 from laurazard/fix-exec-concurrent-shim 
runc-shim: only defer init process exits
 2024-04-05 09:27:35 -04:00
Derek McGowan
d0cdb23fd2
Merge pull request #10024 from ktock/plain-http 
Transfer: Registry: Enable plain HTTP
 2024-04-04 22:15:17 +00:00
Kohei Tokunaga
4332794384
Transfer: Registry: Enable plain HTTP 
Currenlty transfer service doesn't handle plain HTTP connection.
This commit fixes this issue by propagating
`(core/remotes/docker/config).HostOptions.DefaultScheme` from client to the
transfer service.
This commit also fixes ctr to use this feature for "--plain-http" flag.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2024-04-03 10:46:10 +09:00
Maksym Pavlenko
0807efb9ef
Merge pull request #10021 from sctb512/fix-unstable-sort 
fix(cri): fix unexpected order of mounts since go 1.19
 2024-04-02 21:26:09 +00:00
Swagat Bora
88b4cc659a address review comments 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2024-04-02 20:40:55 +00:00
Swagat Bora
f20c49311d Update tracing documentation to add details about manual instrumentation 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2024-04-02 20:40:55 +00:00
Derek McGowan
3a8c27dff8
Merge pull request #9908 from ktock/transfer-host-dir 
Transfer: Registry: Enable to use registry configuration diretory
 2024-04-02 18:59:43 +00:00
Kohei Tokunaga
63d5573a38
remote: Fix HTTPFallback fails when pushing manifest 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2024-04-03 00:28:31 +09:00
Phil Estes
8b788ff93c
Merge pull request #10015 from containerd/dependabot/go_modules/github.com/distribution/reference-0.6.0 
build(deps): bump github.com/distribution/reference from 0.5.0 to 0.6.0
 2024-04-02 13:55:31 +00:00
Fu Wei
4c5f2bce1a
Merge pull request #10023 from dcantah/liststats-notfound 
Add IsNotFound case to ListPodSandboxStats
 2024-04-02 12:46:35 +00:00
Danny Canter
2474a99c30 Add IsNotFound case to ListPodSandboxStats 
Fixes #10013. It seems we can end up in a spot where the sandbox store still
has a listing for a pod, whereas containerds underlying store has removed it.
It might be better to shield the caller (k8s) from these transient errors.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2024-03-30 21:20:22 -07:00
Bin Tang
3830f81678 fix(cri): fix unexpected order of mounts since go 1.19 
Signed-off-by: Bin Tang <bintang@BindeMacBook-Air.local>
 2024-03-30 10:57:57 +08:00
Phil Estes
c17839bdc7
Merge pull request #10016 from containerd/dependabot/go_modules/github.com/Microsoft/hcsshim-0.12.2 
build(deps): bump github.com/Microsoft/hcsshim from 0.12.0 to 0.12.2
 2024-03-29 19:32:51 +00:00
dependabot[bot]
cbb6441827
build(deps): bump github.com/Microsoft/hcsshim from 0.12.0 to 0.12.2 
Bumps [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim) from 0.12.0 to 0.12.2.
- [Release notes](https://github.com/Microsoft/hcsshim/releases)
- [Commits](https://github.com/Microsoft/hcsshim/compare/v0.12.0...v0.12.2)

---
updated-dependencies:
- dependency-name: github.com/Microsoft/hcsshim
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-29 07:32:36 +00:00
dependabot[bot]
362fcf2d27
build(deps): bump github.com/distribution/reference from 0.5.0 to 0.6.0 
Bumps [github.com/distribution/reference](https://github.com/distribution/reference) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/distribution/reference/releases)
- [Commits](https://github.com/distribution/reference/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/distribution/reference
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-29 07:32:27 +00:00
Maksym Pavlenko
7b0802cca7
Merge pull request #10004 from zjumoon01/ctr 
ctr: fix parsing mount options
 2024-03-29 05:07:02 +00:00
Kirtana Ashok
5b6ae0f796 Use different containerd sock address in tests 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2024-03-27 19:04:48 -07:00
Akihiro Suda
b0d00f8636
Merge pull request #9995 from containerd/dependabot/go_modules/github.com/pelletier/go-toml/v2-2.2.0 
build(deps): bump github.com/pelletier/go-toml/v2 from 2.1.1 to 2.2.0
 2024-03-27 11:20:53 +00:00
baijia
ab2c569fb2 ctr: fix parsing mount options 
Set 'DisableSliceFlagSeparator = true'

urfave/cli/v2 uses ',' as default string slice separator.
That means '--mount type=bind,src=/src,des=/des,options=rbind:rw'
will be token as four bind mount options.

Fixes: #10003

Signed-off-by: baijia <baijia.wr@antgroup.com>
 2024-03-27 17:50:39 +08:00
Fu Wei
61ec2e9eb9
Merge pull request #9679 from kiashok/portForwardingWindows-main 
Change port forwarding on windows
 2024-03-27 03:36:09 +00:00
Phil Estes
38a71154c6
Merge pull request #9971 from containerd/dependabot/go_modules/github.com/checkpoint-restore/go-criu/v7-7.1.0 
build(deps): bump github.com/checkpoint-restore/go-criu/v7 from 7.0.0 to 7.1.0
 2024-03-27 01:23:37 +00:00
Phil Estes
b40a912e7b
Merge pull request #9994 from containerd/dependabot/go_modules/github.com/intel/goresctrl-0.7.0 
build(deps): bump github.com/intel/goresctrl from 0.6.0 to 0.7.0
 2024-03-27 00:27:10 +00:00
Phil Estes
9c99229b1a
Merge pull request #9998 from irLinja/typo 
docs: fix typo
 2024-03-26 17:20:16 +00:00
Kirtana Ashok
b97ef91fb7 Change port forwarding on windows 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2024-03-26 10:19:24 -07:00
Arash Haghighat
ea681afbaa
docs: fix typo 
Signed-off-by: Arash Haghighat <arash@linja.pro>
 2024-03-26 16:45:12 +01:00
Fu Wei
74938f6a06
Merge pull request #9885 from Iceber/fix_pin_loaded_pause_image 
cri: ensure the pause image loaded in older versions is pinned
 2024-03-26 13:40:56 +00:00
Laura Brehm
6d00c3ada8
runc-shim: only defer init process exits 
In order to make sure that we don't publish task exit events for init
processes before we do for execs in that container, we added logic to
`processExits` in 892dc54bd2 to skip these
and let the pending exec's `handleStarted` closure process them.

However, the conditional logic in `processExits` added was faulty - we
should only defer processing of exit events related to init processes,
not other execs. Due to this missing condition,
892dc54bd2 introduced a bug where, if
there are many concurrent execs for the same container/init pid, exec
exits are skipped and then never published, resulting in hanging
clients.

This commit adds the missing logic to `processExits`.

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2024-03-26 13:39:11 +00:00
dependabot[bot]
da4ca49498
build(deps): bump github.com/pelletier/go-toml/v2 from 2.1.1 to 2.2.0 
Bumps [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/pelletier/go-toml/releases)
- [Changelog](https://github.com/pelletier/go-toml/blob/v2/.goreleaser.yaml)
- [Commits](https://github.com/pelletier/go-toml/compare/v2.1.1...v2.2.0)

---
updated-dependencies:
- dependency-name: github.com/pelletier/go-toml/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-25 23:13:31 +00:00
dependabot[bot]
dd72fb3b25
build(deps): bump github.com/intel/goresctrl from 0.6.0 to 0.7.0 
Bumps [github.com/intel/goresctrl](https://github.com/intel/goresctrl) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/intel/goresctrl/releases)
- [Commits](https://github.com/intel/goresctrl/compare/v0.6.0...v0.7.0)

---
updated-dependencies:
- dependency-name: github.com/intel/goresctrl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-25 23:13:19 +00:00
Phil Estes
b450bffc9e
Merge pull request #9977 from thaJeztah/remove_todo 
core/images/archive: normalizeReference: remove outdated TODO
 2024-03-25 16:29:16 +00:00
Derek McGowan
3b0b3e533c
Merge pull request #9976 from thaJeztah/internalize_cri_utils 
pkg/systemd, pkg/seutil: move to internal/cri
 2024-03-22 22:31:38 +00:00
Kazuyoshi Kato
f7ef4b0e02
Merge pull request #9983 from cpuguy83/fix_transfer_svc_platform_matcher 
transfer: Platform matcher should match multiple platforms
 2024-03-22 21:54:32 +00:00
Brian Goff
e41e9e11b5 transfer: Platform matcher should match multiple platforms 
This allows arm64 to pull armhf images.
Before this change the transfer service would reject pulls for armhf on
an arm64 machine, or indeed any such platform variant mismatches.

I would argue that its a bit weird for the transfer service to reject a
pull at all since there are legitamate reasons to want to pull images
for other architectures, however that's a more philosophical change.

In the case where I ran into this, I have an arm64 machine running
an armhf containerd in an armhf container (for running some basic sanity
checks during packaging).
Tests started failing once `ctr` was moved to use the transfer service
by default.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2024-03-21 14:59:17 +00:00
Sebastiaan van Stijn
d0d35f0d03
core/images/archive: normalizeReference: remove outdated TODO 
This TODO was added in 9e6db71954, at which time
the reference package was part of the docker/distribution (registry) repository.
The reference package has moved to a standalone module, which has been in use
since 4923470902, so this should no longer be a
concern.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-03-20 11:41:50 +01:00
Sebastiaan van Stijn
26158609b5
pkg/seutil: move to internal/cri 
This pacakge is only used internally in the cri package, which is an internal
packages, so we can make the utility internal as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-03-20 11:11:24 +01:00
Sebastiaan van Stijn
33732bc13e
pkg/systemd: move to internal/cri 
This pacakge is only used internally in the cri package, which is an internal
packages, so we can make the utility internal as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-03-20 11:05:25 +01:00
Maksym Pavlenko
124456ef83
Merge pull request #9864 from hinshun/feature/import-compressed 
Automatically decompress archives for transfer service import
 2024-03-19 22:16:25 +00:00
Maksym Pavlenko
9a4231dcfc
Merge pull request #9961 from zhanluxianshen/clean-cri-opts 
Clean cri options and useless parms
 2024-03-19 19:45:40 +00:00
Maksym Pavlenko
2986e45d9a
Merge pull request #9966 from AkihiroSuda/postpone-9766 
CRI: postpone removal of deprecated config properties
 2024-03-19 19:45:13 +00:00
Maksym Pavlenko
3c9e0bdac3
Merge pull request #9972 from containerd/dependabot/go_modules/github.com/containernetworking/plugins-1.4.1 
build(deps): bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1
 2024-03-19 19:44:05 +00:00
Derek McGowan
93022d83d1
Merge pull request #9735 from dmcgowan/prepare-v2.0.0-rc.0 
Prepare release notes for v2.0.0-rc.0
 2024-03-18 18:46:11 -07:00
Derek McGowan
0d0850af16
Prepare v2.0.0-rc.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-03-18 18:38:35 -07:00
Derek McGowan
f5abb63c09
Update mailmap 
Remove bot mailmap entry since release tool has been updated to ignore names with "[bot]"

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-03-18 18:38:34 -07:00
dependabot[bot]
30813f6463
build(deps): bump github.com/containernetworking/plugins 
Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](https://github.com/containernetworking/plugins/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-18 23:08:13 +00:00
dependabot[bot]
0fafc0c500
build(deps): bump github.com/checkpoint-restore/go-criu/v7 
Bumps [github.com/checkpoint-restore/go-criu/v7](https://github.com/checkpoint-restore/go-criu) from 7.0.0 to 7.1.0.
- [Release notes](https://github.com/checkpoint-restore/go-criu/releases)
- [Commits](https://github.com/checkpoint-restore/go-criu/compare/v7.0.0...v7.1.0)

---
updated-dependencies:
- dependency-name: github.com/checkpoint-restore/go-criu/v7
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-18 23:08:01 +00:00