summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-08-17 10:56:36 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-08-25 22:55:48 -0400
commitd1aece6d4357a412aaa75d71e038d43b047a2f96 (patch)
treed5aff3c608b06a67b0f159e7e28b9a5b44d645a4
parentc1977562f6ffb55e8e7fca3c9b8559fafa6e9234 (diff)
downloadmeta-virtualization-d1aece6d4357a412aaa75d71e038d43b047a2f96.tar.gz
cri-tools: update to v1.24.2
Bumping cri-tools to version v1.24.2-35-g77d02a03, which comprises the following commits: a685ed61 No truncate PodID in ps command if --no-trunc exists 90214b0c Bump version in install section to 1.24.2 on README acf387b3 Update crictl pods to show pod name e7c20ee1 Switch to golang native error wrapping cee70655 Bump github.com/urfave/cli/v2 from 2.11.0 to 2.11.1 e8133ffb Bump github.com/onsi/gomega from 1.19.0 to 1.20.0 b8543347 Bump github.com/sirupsen/logrus from 1.8.1 to 1.9.0 57da46e7 Add documentation about 'statsp' command 6182e3ce Implement checkpoint command 8152f295 Bump github.com/urfave/cli/v2 from 2.10.3 to 2.11.0 a0a19a36 Bump github.com/urfave/cli/v2 from 2.10.2 to 2.10.3 4bb67144 Validate container status in volume mount tests 4da8fc8d Switch to go 1.18 for GitHub actions 1f6b4299 Bump github.com/urfave/cli/v2 from 2.10.1 to 2.10.2 99b030fe Switch to go 1.18 as requirement 55020abc Bump github.com/urfave/cli/v2 from 2.8.1 to 2.10.1 1e69ea9c Bump github.com/opencontainers/runc from 1.1.2 to 1.1.3 b9de22b0 Bump github.com/docker/docker d7fb1f5b Fix timeout for exec sync ecb5c7f8 Fix cri-dockerd build d2da6561 Bump github.com/urfave/cli/v2 from 2.8.0 to 2.8.1 ce68c70c skip tests for dockershim 4f533d58 add-list-stat-test: add tests for list stats db554dad Bump github.com/urfave/cli/v2 from 2.6.0 to 2.8.0 d000ae7a docs: update the version to the latest acf82056 Bump github.com/docker/docker a7df3acb Bump github.com/onsi/ginkgo/v2 from 2.1.3 to 2.1.4 603495f3 Bump github.com/opencontainers/runc from 1.1.1 to 1.1.2 8c659770 Remove selinux build tag d4fe3e7a cmd/critest: fix empty ginkgo flag's value issue 4ee0c367 Add lifecycle index in benchmark update messages. 8ba9205d Skip benchmarks if associated resource number is not set. 2ba1d0e3 Standardize image lifecycle and listing benchmarks. 64263891 Parametrize benchmarking-related timeouts. 4355d842 Pass verbose flag when querying Container/Pod statuses. b40d492e Formalize mechanism for recording/managing benchmark results. 2dd37ab8 Parametrize benchmark settings. 52e0c3dc Rewrite pod.go f0f71212 Vendor onsi/gomega/gmeasure 21aebcad Bump github.com/docker/docker 81036863 Bump github.com/urfave/cli/v2 from 2.5.1 to 2.6.0 f9710f79 Vendor Kubernetes v1.24.0 3ceb4eee Fixes the incubator project reference 1a168cb6 update containerd socket in windows 54148d3d Bump github.com/opencontainers/runc from 1.1.0 to 1.1.1 ce9a5aec Switch to ginkgo/v2 9e9d83d6 Bump github.com/urfave/cli/v2 from 2.4.0 to 2.5.1 a156899c Bump github.com/opencontainers/selinux from 1.10.0 to 1.10.1 4291d65c Bump github.com/docker/docker 5fe1f012 Bump github.com/onsi/gomega from 1.18.1 to 1.19.0 dd6467a3 install CNI on linux abeab06b Fix setup-gcloud action by referencing `v0` 69579189 Fix CRI-O tests 511767e5 Add CRICTL_AUTH env var option to crictl pull 1616f258 Make RPCs CRI v1 and v1alpha2 compatible 769acd39 Bump github.com/urfave/cli/v2 from 2.3.0 to 2.4.0 e5877df5 Bump github.com/docker/docker 6a2a5284 Bump google.golang.org/grpc from 1.44.0 to 1.45.0 e27bb02f Bump github.com/docker/distribution 3e01b9f2 fix seccomp test case for arm64 c6d3e52e Add `crictl statsp` command Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch25
-rw-r--r--recipes-containers/cri-tools/cri-tools_git.bb4
2 files changed, 16 insertions, 13 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 189d905a..2cad7645 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
@@ -1,6 +1,6 @@
1From 28ee02687339b657a7aa93570015a6751c824e2d Mon Sep 17 00:00:00 2001 1From 567b618f2ab9bb722826688d84f328773e4f37ce Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com> 2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Wed, 10 Feb 2021 09:58:24 -0500 3Date: Wed, 17 Aug 2022 11:03:09 -0400
4Subject: [PATCH] build: allow environmental CGO settings and pass 4Subject: [PATCH] build: allow environmental CGO settings and pass
5 dontusecurrentpkgs 5 dontusecurrentpkgs
6 6
@@ -13,9 +13,9 @@ builds (for the most part), and that is not recommended by many
13packages, we end up with errors like: 13packages, we end up with errors like:
14 14
15 1.20.0+gitec9e336fd8c21c4bab89a6aed2c4a138c8cfae75/src/import/_output/crictl \ 15 1.20.0+gitec9e336fd8c21c4bab89a6aed2c4a138c8cfae75/src/import/_output/crictl \
16 -ldflags '-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=1.20.0' \ 16 -ldflags '-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=1.20.0' \
17 -tags '' \ 17 -tags '' \
18 github.com/kubernetes-sigs/cri-tools/cmd/crictl 18 github.com/kubernetes-sigs/cri-tools/cmd/crictl
19 # github.com/kubernetes-sigs/cri-tools/cmd/crictl 19 # github.com/kubernetes-sigs/cri-tools/cmd/crictl
20 cannot find package runtime/cgo (using -importcfg) 20 cannot find package runtime/cgo (using -importcfg)
21 /work/cortexa72-poky-linux/cri-tools/1.20.0+gitec9e336fd8c21c4bab89a6aed2c4a138c8cfae75-r0/recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link: 21 /work/cortexa72-poky-linux/cri-tools/1.20.0+gitec9e336fd8c21c4bab89a6aed2c4a138c8cfae75-r0/recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link:
@@ -33,11 +33,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
33 src/import/Makefile | 3 ++- 33 src/import/Makefile | 3 ++-
34 1 file changed, 2 insertions(+), 1 deletion(-) 34 1 file changed, 2 insertions(+), 1 deletion(-)
35 35
36Index: cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile 36diff --git a/src/import/Makefile b/src/import/Makefile
37=================================================================== 37index 7c5b30ec..9b0dfeaf 100644
38--- cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa.orig/src/import/Makefile 38--- a/src/import/Makefile
39+++ cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile 39+++ b/src/import/Makefile
40@@ -74,7 +74,8 @@ 40@@ -72,7 +72,8 @@ crictl:
41 @$(MAKE) -B $(CRICTL) 41 @$(MAKE) -B $(CRICTL)
42 42
43 $(CRICTL): 43 $(CRICTL):
@@ -46,4 +46,7 @@ Index: cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/M
46+ -a -pkgdir dontusecurrentpkgs \ 46+ -a -pkgdir dontusecurrentpkgs \
47 -ldflags '$(GO_LDFLAGS)' \ 47 -ldflags '$(GO_LDFLAGS)' \
48 -trimpath \ 48 -trimpath \
49 -tags '$(BUILDTAGS)' \ 49 $(PROJECT)/cmd/crictl
50--
512.19.1
52
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb
index b789179b..51ecc205 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 = "23f44eaa489ecd8931ee64de08baa7be9dbdb394" 19SRCREV_cri-tools = "77d02a0356e9e1dca58d44e54dd0799e89856387"
20SRC_URI = "\ 20SRC_URI = "\
21 git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \ 21 git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \
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.23.0+git${SRCREV_cri-tools}" 30PV = "1.24.2+git${SRCREV_cri-tools}"
31 31
32RPROVIDES:${PN} += "crictl" 32RPROVIDES:${PN} += "crictl"
33PACKAGES =+ "${PN}-critest" 33PACKAGES =+ "${PN}-critest"