github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
14,496 Commits 3 Branches 2 Tags 112 MiB
30b929ece7
Commit Graph

14496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
92900bf730
Merge pull request #10069 from anmaxvl/hpc-default-workingdir 
fix default working directory `hostProcess`
 2024-04-12 18:12:42 +00:00
guangwu
b82ced57f9 fix: close profile 
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
 2024-04-12 18:08:29 +08:00
Maksim An
c7ea06a69b fix default working directory hostProcess 
Per https://github.com/kubernetes/enhancements/tree/master/keps/sig-windows/1981-windows-privileged-container-support#container-mounts
the default working directory for `hostProcess` containers should
be `C:\hpc`, however the current default is set to windows default
which is `C:\`.

Signed-off-by: Maksim An <maksiman@microsoft.com>
 2024-04-11 23:35:55 -07:00
Fu Wei
b693d137ed
Merge pull request #10048 from containerd/dependabot/go_modules/otel-db663757ef 
build(deps): bump the otel group with 8 updates
 2024-04-12 02:42:16 +00:00
dependabot[bot]
1040c7b98e
build(deps): bump the otel group with 8 updates 
Bumps the otel group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.49.0` | `0.50.0` |
| [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.49.0` | `0.50.0` |
| [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` |
| [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` |
| [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` |


Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.49.0 to 0.50.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.49.0...zpages/v0.50.0)

Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.49.0 to 0.50.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.49.0...zpages/v0.50.0)

Updates `go.opentelemetry.io/otel` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0)

Updates `go.opentelemetry.io/otel/sdk` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0)

Updates `go.opentelemetry.io/otel/trace` from 1.24.0 to 1.25.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/otel
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/trace
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 18:13:08 +00:00
Maksym Pavlenko
81546a447b
Merge pull request #10050 from containerd/dependabot/go_modules/google.golang.org/grpc-1.63.2 
build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.2
 2024-04-11 17:25:48 +00:00
Maksym Pavlenko
203f9c2b5b
Merge pull request #10059 from dcantah/ignore-eintr-helper 
pkg/sys: Add helper to ignore eintr
 2024-04-11 17:25:13 +00:00
Phil Estes
99693a32c2
Merge pull request #10041 from elezar/bump-container-device-interface-v0.7.1 
Bump tags.cncf.io/container-device-interface to v0.7.1
 2024-04-11 15:33:21 +00:00
Danny Canter
b50e9eae43 Refactor spots to make use of sys.IgnoringEintr 
This makes use of pkg/sys's IgnoringEintr function
to clean up some of the redundant eintr loops we
had laying around.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2024-04-10 11:24:01 -07:00
Danny Canter
3ea69db8e9 Add helper to ignore eintr 
We have quite a few pieces of code laying around containerd
that all loop and ignore eintr as they make syscalls directly
(or use a unix/syscall wrapper) because there's no stdlib
equivalent. This adds a small utility to pkg/sys that we can
use for all of these spots.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2024-04-10 11:16:23 -07:00
Phil Estes
2adae6093e
Merge pull request #10060 from dcantah/unix-waitid 
Replace direct waitid syscall with unix.Waitid
 2024-04-10 16:48:12 +00:00
Evan Lezar
1b62224181 Bump tags.cncf.io/container-device-interface to v0.7.1 
This includes migrating from cdi.GetRegistry() to cdi.Configure() and
using top-level cdi Refresh and InjectDevices functions as applicable.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2024-04-10 15:25:11 +02:00
Danny Canter
ad584ebecb Replace direct waitid syscall with unix.Waitid 
This also replaces the PPidFD constant with the definition in
x/sys/unix

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2024-04-10 05:52:43 -07:00
Akihiro Suda
27dfb0d09e
Merge pull request #10054 from tklauser/unix-syncfs 
core/diff/apply: use unix.Syncfs
 2024-04-10 10:18:47 +00:00
Derek McGowan
7c50784591
Remove empty default tls configuration in ctr 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-04-09 15:40:09 -07:00
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
Tobias Klauser
0ec14fdf8c
core/diff/apply: use unix.Syncfs 
Use the Syncfs wrapper function defined in the golang.org/x/sys/unix
package instead of manually wrapping it in doSyncFs.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2024-04-09 15:12:43 +02:00
dependabot[bot]
739659a4b3
build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.2 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.62.1 to 1.63.2.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.62.1...v1.63.2)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-08 23:56:23 +00: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
ningmingxiao
7bd4d348eb add info of exited event 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2024-04-01 19:49:29 +08: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