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
Akihiro Suda
fd163893bc
Merge pull request #9512 from containerd/dependabot/github_actions/crazy-max/ghaction-github-runtime-3 
build(deps): bump crazy-max/ghaction-github-runtime from 2 to 3
 2023-12-13 05:01:40 +00:00
Akihiro Suda
43bcea89a7
Merge pull request #9515 from containerd/dependabot/github_actions/actions/github-script-7 
build(deps): bump actions/github-script from 6 to 7
 2023-12-13 04:46:10 +00:00
Akihiro Suda
d9eeec3bd0
Merge pull request #9516 from containerd/dependabot/github_actions/docker/login-action-3 
build(deps): bump docker/login-action from 2 to 3
 2023-12-13 04:45:49 +00:00
Akihiro Suda
32ad372706
Merge pull request #9510 from containerd/dependabot/github_actions/actions/setup-go-5 
build(deps): bump actions/setup-go from 3 to 5
 2023-12-13 04:14:25 +00:00
Akihiro Suda
5f38d64f2a
Merge pull request #9508 from containerd/dependabot/github_actions/actions/checkout-4 
build(deps): bump actions/checkout from 3 to 4
 2023-12-13 03:52:59 +00:00
dependabot[bot]
6726a2aebf
build(deps): bump k8s.io/component-base from 0.28.2 to 0.28.4 
Bumps [k8s.io/component-base](https://github.com/kubernetes/component-base) from 0.28.2 to 0.28.4.
- [Commits](https://github.com/kubernetes/component-base/compare/v0.28.2...v0.28.4)

---
updated-dependencies:
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:26:34 +00:00
dependabot[bot]
0c98f10631
build(deps): bump github.com/klauspost/compress from 1.17.2 to 1.17.4 
Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.17.2 to 1.17.4.
- [Release notes](https://github.com/klauspost/compress/releases)
- [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml)
- [Commits](https://github.com/klauspost/compress/compare/v1.17.2...v1.17.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:25:20 +00:00
dependabot[bot]
39ba0347ee
build(deps): bump go.etcd.io/bbolt from 1.3.7 to 1.3.8 
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.7...v1.3.8)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:24:42 +00:00
dependabot[bot]
db43e3d1f7
build(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0 
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0.
- [Commits](https://github.com/golang/sync/compare/v0.4.0...v0.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:24:20 +00:00
dependabot[bot]
4660090baf
build(deps): bump actions/stale from 8 to 9 
Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v8...v9)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:21:03 +00:00
dependabot[bot]
ace8ab1bd6
build(deps): bump docker/login-action from 2 to 3 
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:21:01 +00:00
dependabot[bot]
0b94716e82
build(deps): bump actions/github-script from 6 to 7 
Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:55 +00:00
dependabot[bot]
9133ad811d
build(deps): bump actions/upload-artifact from 1 to 3 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 1 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v1...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:47 +00:00
dependabot[bot]
c1823a7c6b
build(deps): bump ossf/scorecard-action from 2.0.3 to 2.3.1 
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.0.3 to 2.3.1.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](865b409285...0864cf1902)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:41 +00:00
dependabot[bot]
36b12cbcbb
build(deps): bump crazy-max/ghaction-github-runtime from 2 to 3 
Bumps [crazy-max/ghaction-github-runtime](https://github.com/crazy-max/ghaction-github-runtime) from 2 to 3.
- [Release notes](https://github.com/crazy-max/ghaction-github-runtime/releases)
- [Commits](https://github.com/crazy-max/ghaction-github-runtime/compare/v2...v3)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-github-runtime
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:36 +00:00
dependabot[bot]
dc5a6cfaef
build(deps): bump google-github-actions/auth from 0 to 2 
Bumps [google-github-actions/auth](https://github.com/google-github-actions/auth) from 0 to 2.
- [Release notes](https://github.com/google-github-actions/auth/releases)
- [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google-github-actions/auth/compare/v0...v2)

---
updated-dependencies:
- dependency-name: google-github-actions/auth
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:31 +00:00
dependabot[bot]
f6a9c69665
build(deps): bump actions/setup-go from 3 to 5 
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v3...v5)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:26 +00:00
dependabot[bot]
e27ea7d1ad
build(deps): bump google-github-actions/upload-cloud-storage 
Bumps [google-github-actions/upload-cloud-storage](https://github.com/google-github-actions/upload-cloud-storage) from 0.10.4 to 1.0.3.
- [Release notes](https://github.com/google-github-actions/upload-cloud-storage/releases)
- [Changelog](https://github.com/google-github-actions/upload-cloud-storage/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google-github-actions/upload-cloud-storage/compare/v0.10.4...v1.0.3)

---
updated-dependencies:
- dependency-name: google-github-actions/upload-cloud-storage
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:20 +00:00
dependabot[bot]
3ca95282ea
build(deps): bump actions/checkout from 3 to 4 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 00:20:14 +00:00
Derek McGowan
c0e94bc9a8
Merge pull request #9492 from kiashok/moveCriConfig 
Move GenerateRuntimeOptions() to pkg/cri/config
 2023-12-13 00:13:46 +00:00
Maksym Pavlenko
8f1479132f
Merge pull request #9504 from AkihiroSuda/dependabot 
CI: enable dependabot
 2023-12-12 23:41:52 +00:00
Samuel Karp
edcbc508b6
Merge pull request #9496 from mxpv/links 
Add nighly job to verify doc links (and fix broken links)
 2023-12-12 23:04:50 +00:00
Phil Estes
35c125b2dd
Merge pull request #9503 from ktock/go-toml-2.1.1 
go.mod: Bump up github.com/pelletier/go-toml to v2.1.1
 2023-12-12 21:25:14 +00:00
Derek McGowan
1feb23465f
Merge pull request #9401 from fuweid/v2-mode 
*: introduce image_pull_with_sync_fs in CRI
 2023-12-12 14:34:44 +00:00
Djordje Lukic
1398186ca7
WithAppendAdditionalGroups: better /etc/group handling 
Scratch images don't necessarily have the /etc/group file, so we shouldn't
fail if opening/parsing it is not needed: if all the group to add are numeric.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2023-12-12 15:24:41 +01:00
Akihiro Suda
5a140dca5e
CI: enable dependabot 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-12-12 18:46:07 +09:00
Kohei Tokunaga
c1197995b9
go.mod: Bump up github.com/pelletier/go-toml to v2.1.1 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-12-12 14:28:55 +09:00
Wei Fu
23278c81fb *: introduce image_pull_with_sync_fs in CRI 
It's to ensure the data integrity during unexpected power failure.

Background:

Since release 1.3, in Linux system, containerD unpacks and writes files into
overlayfs snapshot directly. It doesn’t involve any mount-umount operations
so that the performance of pulling image has been improved.

As we know, the umount syscall for overlayfs will force kernel to flush
all the dirty pages into disk. Without umount syscall, the files’ data relies
on kernel’s writeback threads or filesystem's commit setting (for
instance, ext4 filesystem).

The files in committed snapshot can be loss after unexpected power failure.
However, the snapshot has been committed and the metadata also has been
fsynced. There is data inconsistency between snapshot metadata and files
in that snapshot.

We, containerd, received several issues about data loss after unexpected
power failure.

* https://github.com/containerd/containerd/issues/5854
* https://github.com/containerd/containerd/issues/3369#issuecomment-1787334907

Solution:

* Option 1: SyncFs after unpack

Linux platform provides [syncfs][syncfs] syscall to synchronize just the
filesystem containing a given file.

* Option 2: Fsync directories recursively and fsync on regular file

The fsync doesn't support symlink/block device/char device files. We
need to use fsync the parent directory to ensure that entry is
persisted.

However, based on [xfstest-dev][xfstest-dev], there is no case to ensure
fsync-on-parent can persist the special file's metadata, for example,
uid/gid, access mode.

Checkout [generic/690][generic/690]: Syncing parent dir can persist
symlink. But for f2fs, it needs special mount option. And it doesn't say
that uid/gid can be persisted. All the details are behind the
implemetation.

> NOTE: All the related test cases has `_flakey_drop_and_remount` in
[xfstest-dev].

Based on discussion about [Documenting the crash-recovery guarantees of Linux file systems][kernel-crash-recovery-data-integrity],
we can't rely on Fsync-on-parent.

* Option 1 is winner

This patch is using option 1.

There is test result based on [test-tool][test-tool].
All the networking traffic created by pull is local.

  * Image: docker.io/library/golang:1.19.4 (992 MiB)
    * Current: 5.446738579s
      * WIOS=21081, WBytes=1329741824, RIOS=79, RBytes=1197056
    * Option 1: 6.239686088s
      * WIOS=34804, WBytes=1454845952, RIOS=79, RBytes=1197056
    * Option 2: 1m30.510934813s
      * WIOS=42143, WBytes=1471397888, RIOS=82, RBytes=1209344

  * Image: docker.io/tensorflow/tensorflow:latest (1.78 GiB, ~32590 Inodes)
    * Current: 8.852718042s
      * WIOS=39417, WBytes=2412818432, RIOS=2673, RBytes=335987712
    * Option 1: 9.683387174s
      * WIOS=42767, WBytes=2431750144, RIOS=89, RBytes=1238016
    * Option 2: 1m54.302103719s
      * WIOS=54403, WBytes=2460528640, RIOS=1709, RBytes=208237568

The Option 1 will increase `wios`. So, the `image_pull_with_sync_fs` is
option in CRI plugin.

[syncfs]: <https://man7.org/linux/man-pages/man2/syncfs.2.html>
[xfstest-dev]: <https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git>
[generic/690]: <https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/tree/tests/generic/690?h=v2023.11.19>
[kernel-crash-recovery-data-integrity]: <https://lore.kernel.org/linux-fsdevel/1552418820-18102-1-git-send-email-jaya@cs.utexas.edu/>
[test-tool]: <a17fb2010d/contrib/syncfs/containerd/main_test.go (L51)>

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-12-12 10:18:39 +08:00
Wei Fu
bd5c602c4d api: introduce sync_fs to diff.ApplyRequest 
It's flag to synchronize the underlying filesystem containing files
created during Apply.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-12-12 10:18:39 +08:00
James Lakin
6bb81ee577
Document ns query string added to mirror requests 
This also adds clarification to the `server` field being used as a fallback.

Signed-off-by: James Lakin <james@jameslakin.co.uk>
 2023-12-11 13:44:39 +00:00
Maksym Pavlenko
98526c9d38 Exclude releases directory from links checker 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-12-10 12:15:53 -08:00
Samuel Karp
75f72d6272
Merge pull request #9456 from fuweid/enable-arm64 
*: enable ARM64 runner
 2023-12-10 05:59:22 +00:00
Maksym Pavlenko
f67c1632f5 Add ignore list for links 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-12-09 13:43:06 -08:00
Maksym Pavlenko
e740dd3d6b Add links status badge 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-12-09 13:09:39 -08:00
Maksym Pavlenko
bfa651c69f Fix broken links 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-12-09 13:09:39 -08:00
Maksym Pavlenko
c9fa5b9801 Add nighly job to verify doc links 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-12-09 12:43:53 -08:00
Derek McGowan
9e4d53df75
Merge pull request from GHSA-7ww5-4wqc-m92c 
[main] deny /sys/devices/virtual/powercap
 2023-12-08 11:35:49 -08:00
Phil Estes
4a6a5af8d0
Merge pull request #9486 from thaJeztah/release_dockerignore 
release: add .dockerignore to fix repeated builds
 2023-12-08 10:37:11 -05:00
Kirtana Ashok
25b052cbca Move GenerateRuntimeOptions() to pkg/cri/config 
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
 2023-12-07 12:23:00 -08:00
Wei Fu
cb5a48e645 *: enable ARM64 runner 
There are many Kubernetes clusters running on ARM64. Enable ARM64 runner
is to commit to support ARM64 platform officially.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-12-07 23:55:36 +08:00
Phil Estes
a68efb1bad
Merge pull request #9351 from thaJeztah/update_golang_1.21.4 
update to go1.21.5, go1.20.12
 2023-12-07 10:39:24 -05:00
Sebastiaan van Stijn
596ada3ac0
release: add .dockerignore to fix repeated builds 
Ignore previous release-artifacts so that repeated builds rebuild them. Before
this patch, building the dockerfile multiple times would rebuild the binaries,
but would not produce a new release-artifact (`.tar.gz`), because the make
target would not trigger if the file was already present.

With this patch, existing release-artifacts are no longer copied into the
Dockerfile, which prevents this, as well as saving some time copying files
that won't be used.

In addition to the above, other excludes were copied from the .gitignore,
to prevent cache-busts.

I also added `.DS_Store` files to the ignore-file. These files are generated
on macOS when navigating the filesystem, and would cause the build to fail if
present, as well as invalidating the build-cache;

    docker buildx build --build-arg RELEASE_VER=main --build-arg UBUNTU_VERSION=22.04 --build-arg GO_VERSION=1.21.5 -f .github/workflows/release/Dockerfile -o releases/ .
    ...
     > [target 4/4] RUN     export GIT_STATUS_OUTPUT=$(git status --porcelain) &&   test -z $GIT_STATUS_OUTPUT || (echo $GIT_STATUS_OUTPUT && exit 1):
    0.118 ++ git status --porcelain
    1.405 + export 'GIT_STATUS_OUTPUT=?? .DS_Store
    1.405 ?? .github/.DS_Store
    ...
    1.407 + test -z gc .DS_Store gc .github/.DS_Store gc api/.DS_Store gc api/api/ gc api/runtime/.DS_Store gc api/services/.DS_Store gc api/types/.DS_Store gc archive/.DS_Store gc cmd/.DS_Store gc cmd/containerd-shim-runc-v2/.DS_Store gc cmd/containerd-shim-runc-v2/vendor/ gc cmd/containerd/.DS_Store gc cmd/ctr/.DS_Store gc content/.DS_Store gc contrib/.DS_Store gc contrib/ansible/.DS_Store gc contrib/seccomp/.DS_Store gc diff/.DS_Store gc docs/.DS_Store gc docs/historical/.DS_Store gc events/.DS_Store gc gc/.DS_Store gc images/.DS_Store gc images/converter/.DS_Store gc integration/.DS_Store gc integration/cri-api/.DS_Store gc integration/failpoint/.DS_Store gc integration/images/.DS_Store gc integration/remote/.DS_Store gc leases/.DS_Store gc metadata/.DS_Store gc metrics/.DS_Store gc metrics/cgroups/.DS_Store gc metrics/types/.DS_Store gc pkg/.DS_Store gc pkg/cri/.DS_Store gc pkg/oom/.DS_Store gc pkg/transfer/.DS_Store gc plugins/.DS_Store gc protobuf/.DS_Store gc releases/.DS_Store
    1.407 /bin/bash: line 1: test: too many arguments
    1.408 + echo gc .DS_Store gc .github/.DS_Store gc api/.DS_Store gc api/api/ gc api/runtime/.DS_Store gc api/services/.DS_Store gc api/types/.DS_Store gc archive/.DS_Store gc cmd/.DS_Store gc cmd/containerd-shim-runc-v2/.DS_Store gc cmd/containerd-shim-runc-v2/vendor/ gc cmd/containerd/.DS_Store gc cmd/ctr/.DS_Store gc content/.DS_Store gc contrib/.DS_Store gc contrib/ansible/.DS_Store gc contrib/seccomp/.DS_Store gc diff/.DS_Store gc docs/.DS_Store gc docs/historical/.DS_Store gc events/.DS_Store gc gc/.DS_Store gc images/.DS_Store gc images/converter/.DS_Store gc integration/.DS_Store gc integration/cri-api/.DS_Store gc integration/failpoint/.DS_Store gc integration/images/.DS_Store gc integration/remote/.DS_Store gc leases/.DS_Store gc metadata/.DS_Store gc metrics/.DS_Store gc metrics/cgroups/.DS_Store gc metrics/types/.DS_Store gc pkg/.DS_Store gc pkg/cri/.DS_Store gc pkg/oom/.DS_Store gc pkg/transfer/.DS_Store gc plugins/.DS_Store gc protobuf/.DS_Store gc releases/.DS_Store
    1.408 + exit 1
    1.408 gc .DS_Store gc .github/.DS_Store gc api/.DS_Store gc api/api/ gc api/runtime/.DS_Store gc api/services/.DS_Store gc api/types/.DS_Store gc archive/.DS_Store gc cmd/.DS_Store gc cmd/containerd-shim-runc-v2/.DS_Store gc cmd/containerd-shim-runc-v2/vendor/ gc cmd/containerd/.DS_Store gc cmd/ctr/.DS_Store gc content/.DS_Store gc contrib/.DS_Store gc contrib/ansible/.DS_Store gc contrib/seccomp/.DS_Store gc diff/.DS_Store gc docs/.DS_Store gc docs/historical/.DS_Store gc events/.DS_Store gc gc/.DS_Store gc images/.DS_Store gc images/converter/.DS_Store gc integration/.DS_Store gc integration/cri-api/.DS_Store gc integration/failpoint/.DS_Store gc integration/images/.DS_Store gc integration/remote/.DS_Store gc leases/.DS_Store gc metadata/.DS_Store gc metrics/.DS_Store gc metrics/cgroups/.DS_Store gc metrics/types/.DS_Store gc pkg/.DS_Store gc pkg/cri/.DS_Store gc pkg/oom/.DS_Store gc pkg/transfer/.DS_Store gc plugins/.DS_Store gc protobuf/.DS_Store gc releases/.DS_Store

Finally, I removed a redundant "echo", which causes (as seen above) the list
of uncommitted files to be printed twice (or three times even). We already print
the list of files, as well as print the `test -z` command that is executed, which
includes the list of files (`$GIT_STATUS_OUTPUT`). With this patch applied;

    6.307 + test -z gc .DS_Store gc .github/.DS_Store gc api/.DS_Store gc api/api/ gc api/runtime/.DS_Store gc api/services/.DS_Store gc api/types/.DS_Store gc archive/.DS_Store gc cmd/.DS_Store gc cmd/containerd-shim-runc-v2/.DS_Store gc cmd/containerd-shim-runc-v2/vendor/ gc cmd/containerd/.DS_Store gc cmd/ctr/.DS_Store gc content/.DS_Store gc contrib/.DS_Store gc contrib/ansible/.DS_Store gc contrib/seccomp/.DS_Store gc diff/.DS_Store gc docs/.DS_Store gc docs/historical/.DS_Store gc events/.DS_Store gc gc/.DS_Store gc images/.DS_Store gc images/converter/.DS_Store gc integration/.DS_Store gc integration/cri-api/.DS_Store gc integration/failpoint/.DS_Store gc integration/images/.DS_Store gc integration/remote/.DS_Store gc leases/.DS_Store gc metadata/.DS_Store gc metrics/.DS_Store gc metrics/cgroups/.DS_Store gc metrics/types/.DS_Store gc pkg/.DS_Store gc pkg/cri/.DS_Store gc pkg/oom/.DS_Store gc pkg/transfer/.DS_Store gc plugins/.DS_Store gc protobuf/.DS_Store gc releases/.DS_Store
    6.307 /bin/bash: line 1: test: too many arguments
    6.308 + echo 'git repository contains uncommitted changes'
    6.308 + exit 1
    6.308 git repository contains uncommitted changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-12-07 15:03:34 +01:00
Samuel Karp
148d21b1ae
Merge pull request #9480 from dmcgowan/fix-otel-http 
Fix otel version incompatibility
 2023-12-06 22:08:58 +00:00
Derek McGowan
cf4b57989d
Remove deprecated tracing function 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-12-06 11:20:31 -08:00
Derek McGowan
8203bb9977
Add HTTP client update function to tracing library 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-12-06 11:17:44 -08:00
Milas Bowman
ad3b806a4f
fix(tracing): use latest version of semconv 
All components need to use a consistent `semconv` version or OTel
will emit errors about "cannot merge resource due to conflicting Schema URL".

Switch to the appropriate semconv version, which requires dropping
usage of `httpconv`. Instead, the upstream HTTP client hooks are
used directly. (The lower-level functions are no longer exported by
OTel.)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-06 11:09:40 -08:00
Akihiro Suda
194a1fdd2c
Merge pull request #9473 from ktock/cni-plugins-1.4.0 
go.mod: Bump up github.com/containernetworking/plugins to v1.4.0
 2023-12-06 05:27:21 +00:00
Derek McGowan
3b46a41527
Merge pull request #9474 from lengrongfu/feat/upgrade-crun-version 
upgrade crun version from 1.9 to 1.12
 2023-12-06 04:53:40 +00:00
lengrongfu
22db60b6ba upgrade crun version from 1.9 to 1.12 
Signed-off-by: lengrongfu <lenronfu@gmail.com>
 2023-12-06 10:19:43 +08:00
Kohei Tokunaga
9937909693
go.mod: Bump up github.com/containernetworking/plugins to v1.4.0 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-12-06 10:29:44 +09:00