summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2026-05-28 12:58:26 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2026-05-28 13:41:30 +0000
commitbefa00ea2e98e7951bfa920dd07cd60cf18c911e (patch)
tree504b85d944de78abb4a1f4b154d92d0951a8ca13 /recipes-containers
parent2bdb4a1008b2bb898a04c2373125fb7953e7cc24 (diff)
downloadmeta-virtualization-befa00ea2e98e7951bfa920dd07cd60cf18c911e.tar.gz
cri-tools: update to v1.36.0-tip
Bumping cri-tools to version v1.36.0-90-g5b24423f, which comprises the following commits: 722f32d9 enable zizmor 44739caa build(deps): bump the gomod group with 4 updates 672af9eb align local containerized test with CI 4d8700e0 crictl: deduplicate pull-related CLI flags 327420d2 crictl: extract generic resourceStatus to deduplicate status functions feb33d5f Remove accidentally committed crictl binary 599eb98f crictl: extract shared helpers and fix ContainerStats context ca182722 build(deps): bump crate-ci/typos from 1.46.2 to 1.46.3 41d99943 RunPodSandbox state contract and blocking behavior 924b3f91 add a root span 27965b7a task: add prettier to dependencies 85613d53 build(deps): bump the gomod group with 2 updates cca05915 crictl: add unit tests for utility functions afc8031e crictl: replace sort.Sort types with slices.SortFunc 1132c1ec task: bump ubuntu to latest LTS baef25ec crictl: consolidate pull flag definitions 672f15df hack/tools: update cri-dockerd to v0.4.3 and go-md2man to v2.0.7 1cb460d4 crictl: use sentinel error for empty ID validation 2b23070f ci: cancel in-progress workflow runs on new push f8a06b7b crictl: encapsulate global config and add client injection for testability d4020096 smoke test for NRI integration tests fcce23a4 Bump crate-ci/typos from 1.46.1 to 1.46.2 64b7931f Bump the gomod group with 2 updates 09088498 bump k8s.io dependencies to v0.36.1 e283eb1f Bump google.golang.org/grpc from 1.81.0 to 1.81.1 in the gomod group 2936afd8 ci: declare contents: read across the 4 remaining workflows d1a6602a Bump Go version to 1.26.3 4fb994e1 Bump the gomod group across 1 directory with 3 updates 9670a1a9 Bump crate-ci/typos from 1.46.0 to 1.46.1 1cdbfd11 Bump the gomod group with 3 updates a48b368f fix: use full path for go-md2man in verify-docs.sh 3be057e2 bumped linter and made it run on all platforms 00547873 Bump github.com/opencontainers/selinux in the gomod group d4532c43 refactor: move linux-specific validation code to separate files 5d60ceed local dev docker-based containerd environment 37552aba improve agent docs and fix zeitgeist for macOS ebd7d9b8 Bump google.golang.org/grpc from 1.80.0 to 1.81.0 in the gomod group 9dcc45fc Bump crate-ci/typos from 1.45.2 to 1.46.0 40f63b5b remove year from boilerplate bb03b7a1 Bump the gomod group with 2 updates b2918849 Bump crate-ci/typos from 1.45.1 to 1.45.2 c7e207d7 Bump the gomod group across 1 directory with 9 updates ea9454e9 bump cri-tools version to v1.36.0 after release 82f28d67 bumpo to release version of 1.36 5988383a add copyright dfd5525f crictl: replace docker/docker timestamp dependency a846c714 fix typo: intead -> instead 3f28b1c4 Add SergeyKanzhelev and tallclair to sig-node-approvers 58a1a780 Bump crate-ci/typos from 1.45.0 to 1.45.1 31b19db9 Bump actions/cache from 5.0.4 to 5.0.5 a1fa6b1f Makefile: Don't explicitly pass GOFLAGS to go commands 507358f9 Bump actions/upload-artifact from 7.0.0 to 7.0.1 3f90c7cf Bump k8s.io dependencies to v0.36.0-rc.0 27c856e8 more gitignore 30434d06 bump go tp 1.26.2 7d5c1228 Bump crate-ci/typos from 1.44.0 to 1.45.0 aad688ce Bump google.golang.org/grpc from 1.79.3 to 1.80.0 in the gomod group af533d44 Bump actions/setup-go from 6.3.0 to 6.4.0 ffa8e166 validate: add KubernetesPodUIDLabel to container attributes test bdffd30d validate: use subset checks for labels and annotations 661c011e removed deprecated TODO 746da572 Use k8s v0.36.0-beta.0 c98d29d2 Remediate GHSA-6g7g-w4f8-9c9x (bummp jsonparser to 1.1.2) 58323188 Remediate CVE-2026-33186 (bump grpc to 1.79.3) d2f54006 validate: add conformance tests for attribute preservation a8b6fcf6 Revert "Disable runc integration tests due to AppArmor issue" c633d342 adopt the latest cri client 76ce604b Bump actions/cache from 5.0.3 to 5.0.4 5077d436 feat: add prettier validation to Makefile and AGENTS.md 43768b05 crictl: replace utilyaml with sigs.k8s.io/yaml 3866e388 Add verify rule to Makefile cdd3d738 created a local copy of AggregateGoroutines 14a98847 start using k8s.io/streaming 9ddc149f use latest cri client with the logger used from context Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch10
-rw-r--r--recipes-containers/cri-tools/cri-tools_git.bb4
2 files changed, 7 insertions, 7 deletions
diff --git a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
index 29e0367b..826011c5 100644
--- a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
+++ b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
@@ -35,11 +35,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
35 src/import/Makefile | 3 ++- 35 src/import/Makefile | 3 ++-
36 1 file changed, 2 insertions(+), 1 deletion(-) 36 1 file changed, 2 insertions(+), 1 deletion(-)
37 37
38Index: cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile 38Index: cri-tools-1.36.0+git/src/import/Makefile
39=================================================================== 39===================================================================
40--- cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351.orig/src/import/Makefile 40--- cri-tools-1.36.0+git.orig/src/import/Makefile
41+++ cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile 41+++ cri-tools-1.36.0+git/src/import/Makefile
42@@ -74,7 +74,8 @@ 42@@ -123,7 +123,8 @@ crictl: ## Build the crictl binary.
43 @$(MAKE) -B $(CRICTL) 43 @$(MAKE) -B $(CRICTL)
44 44
45 $(CRICTL): 45 $(CRICTL):
@@ -47,5 +47,5 @@ Index: cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/M
47+ $(GO_BUILD) -o $@ \ 47+ $(GO_BUILD) -o $@ \
48+ -a -pkgdir dontusecurrentpkgs \ 48+ -a -pkgdir dontusecurrentpkgs \
49 -ldflags '$(GO_LDFLAGS)' \ 49 -ldflags '$(GO_LDFLAGS)' \
50 $(GOFLAGS) \
51 $(PROJECT)/cmd/crictl 50 $(PROJECT)/cmd/crictl
51
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb
index b2706311..b4e79a07 100644
--- a/recipes-containers/cri-tools/cri-tools_git.bb
+++ b/recipes-containers/cri-tools/cri-tools_git.bb
@@ -16,7 +16,7 @@ What is not in scope for this project? \
16 non-exist on the kube-apiserver. \ 16 non-exist on the kube-apiserver. \
17 " 17 "
18 18
19SRCREV_cri-tools = "16d5673873fda6d333f8411778a35f5778998680" 19SRCREV_cri-tools = "5b24423f01280a50667d95affa1df39c4f5f5aa0"
20SRC_URI = "\ 20SRC_URI = "\
21 git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ 21 git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
22 file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ 22 file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2
27 27
28GO_IMPORT = "import" 28GO_IMPORT = "import"
29 29
30PV = "1.35.0+git" 30PV = "1.36.0+git"
31 31
32RPROVIDES:${PN} += "crictl" 32RPROVIDES:${PN} += "crictl"
33PACKAGES =+ "${PN}-critest" 33PACKAGES =+ "${PN}-critest"