cri-tools: update to v1.26.1

We adjust our install routine to find the binaries in architecture
and OS target specific directories, but otherwise the build is
unchanged.

Bumping cri-tools to version v1.26.0-122-g4daea449, which comprises the following commits:

    1dbda3f7 Bump github.com/opencontainers/runc from 1.1.4 to 1.1.5
    6f1de233 Bump github.com/docker/docker
    d55f85f2 update release support details in the README
    3e40ab7e Bump github.com/onsi/gomega from 1.27.4 to 1.27.5
    13c94c7a Update Ubuntu 18.04 to 20.04
    8de6b6d7 Bump github.com/urfave/cli/v2 from 2.25.0 to 2.25.1
    8db31a76 Bump github.com/onsi/ginkgo/v2 from 2.9.1 to 2.9.2
    3c0741e5 Bump github.com/golang/glog from 1.1.0 to 1.1.1
    4d45340a feat: add riscv64
    53e4c3ba Bump github.com/onsi/gomega from 1.27.3 to 1.27.4
    e13ad25e Bump github.com/onsi/ginkgo/v2 from 2.9.0 to 2.9.1
    21e62dde Bump github.com/onsi/gomega from 1.27.2 to 1.27.3
    02317f82 Bump github.com/golang/protobuf from 1.5.2 to 1.5.3
    9d847e2c Bump golang.org/x/net from 0.7.0 to 0.8.0
    bfdb44b5 Bump github.com/urfave/cli/v2 from 2.24.4 to 2.25.0
    060929a6 Bump github.com/golang/glog from 1.0.0 to 1.1.0
    c020f31f Bump golang.org/x/term from 0.5.0 to 0.6.0
    47b33362 Bump github.com/onsi/ginkgo/v2 from 2.8.4 to 2.9.0
    f8cb6925 Bump github.com/onsi/gomega from 1.27.1 to 1.27.2
    578b38a1 Bump github.com/onsi/ginkgo/v2 from 2.8.3 to 2.8.4
    ce2c55c0 Bump github.com/onsi/gomega from 1.26.0 to 1.27.1
    f7333f20 Run GitHub actions by `push` only on `master` and tags
    64f3f275 Bump github.com/onsi/ginkgo/v2 from 2.8.1 to 2.8.3
    8f27b574 Bump github.com/urfave/cli/v2 from 2.24.3 to 2.24.4
    b27232f2 Bump golang.org/x/net from 0.6.0 to 0.7.0
    61a85a93 Bump github.com/onsi/ginkgo/v2 from 2.8.0 to 2.8.1
    c61a79e9 fix crictl config list display error
    595572a6 crictl code and args optimization.
    85c6f21d Bump github.com/docker/docker
    63a1d5a6 crictl config add list flag
    b4ffa89f Bump golang.org/x/net from 0.5.0 to 0.6.0
    3c35861c Bump github.com/opencontainers/selinux from 1.10.2 to 1.11.0
    753c9a88 Makefile support cross compilation, build_bin_path optimization
    fda6d7f8 crictl stats add name row
    be5f634b Bump golang.org/x/term from 0.4.0 to 0.5.0
    82c3e8ae Bump golang.org/x/sys from 0.4.0 to 0.5.0
    6fc9e4af Bump github.com/urfave/cli/v2 from 2.24.2 to 2.24.3
    01796ae5 Bump github.com/docker/docker
    dd20ea16 Bump github.com/onsi/ginkgo/v2 from 2.7.1 to 2.8.0
    ef8a0d68 Bump github.com/urfave/cli/v2 from 2.24.1 to 2.24.2
    0b81ff2a Bump github.com/onsi/ginkgo/v2 from 2.7.0 to 2.7.1
    a4c976aa Makefile: pass in a custom variable GOARCH
    f6ec8fec Bump github.com/onsi/gomega from 1.25.0 to 1.26.0
    5923662b Bump github.com/urfave/cli/v2 from 2.23.7 to 2.24.1
    a8ddf64a Bump github.com/docker/docker
    1e27c2c4 Bump github.com/onsi/gomega from 1.24.2 to 1.25.0
    edf14e37 Update docs version to match latest release
    850c8469 Bump other OTEL deps
    6d46b592 Bump go.opentelemetry.io/otel/trace from 1.10.0 to 1.11.2
    5364af0f fix: formatting
    6f078ed6 fix(docs): add a note about other supported platforms
    c2573905 Pass `nil` as tracer provider
    8ac43a45 fix: add tip on latest version
    8dee7ff5 Update ginkgo and gomega
    92edf29e Switch to `registry.k8s.io`
    aa036b5a Increase defualt timeout on Windows
    5886c7df Add support for calling Windows pod stats
    64e8f6b8 Bump golang.org/x/net from 0.4.0 to 0.5.0
    3a981a98 Switch away from Docker Hub to avoid rate limits
    b3262be7 Bump github.com/docker/docker
    5046b65b Add haircommander to reviewers
    4e387743 set LTS v1.6.12 into matrix to replace old v1.5 entry
    baefda37 gh actions: remove dockershim tests
    24cc748b plumb context through CRI
    86befea9 bump to go 1.19
    a7154756 vendor: bump kube to 1.26
    f9764647 Bump github.com/urfave/cli/v2 from 2.23.5 to 2.23.7
    6220423b Bump golang.org/x/net from 0.3.0 to 0.4.0
    d6d8005f Bump golang.org/x/net from 0.2.0 to 0.3.0
    f4cf7b6e Bump golang.org/x/term from 0.2.0 to 0.3.0
    c37655ee Bump golang.org/x/sys from 0.2.0 to 0.3.0
    9962fb03 add missing CPU count
    7493f666 Add detach key sequence support
    ca1571e6 critest: ensure server is running before portforward
    b6fb4b1d Bump github.com/urfave/cli/v2 from 2.23.4 to 2.23.5
    fa370cc5 Bump golang.org/x/net from 0.1.0 to 0.2.0
    f1998865 Bump golang.org/x/term from 0.1.0 to 0.2.0
    5c48eb26 Bump github.com/urfave/cli/v2 from 2.23.0 to 2.23.4
    6b420011 Bump golang.org/x/sys from 0.1.0 to 0.2.0
    6f8965f4 Bump github.com/onsi/gomega from 1.23.0 to 1.24.0
    913089a4 Bump github.com/urfave/cli/v2 from 2.20.3 to 2.23.0
    622b04f1 Bump github.com/onsi/gomega from 1.22.1 to 1.23.0
    5acd3285 Bump github.com/docker/docker
    c4b3e806 Bump github.com/urfave/cli/v2 from 2.20.2 to 2.20.3
    0b1abed2 Bump github.com/onsi/ginkgo/v2 from 2.3.1 to 2.4.0
    91521036 specify one supplementalGroup instead of two to make test code simpler
    2649f53e added a validation test case For SupplementalGroups with the predefined groups in the container image
    d965134b fix copyright section in image-predefined-group's Dockerfile
    59137ff5 images/image-predefined-groups: don't specify group in USER
    f1cb7aff Bump github.com/docker/docker
    72d1ed12 add test image for testing SupplementalGroups with predefined groups in the container image
    0fd7a1b4 Bump github.com/urfave/cli/v2 from 2.19.2 to 2.20.2
    ac1c0c5b Bump github.com/docker/docker
    44965774 Bump github.com/onsi/gomega from 1.21.1 to 1.22.1
    78d5c955 Bump github.com/onsi/ginkgo/v2 from 2.3.0 to 2.3.1
    11c282fd Bump github.com/onsi/ginkgo/v2 from 2.2.0 to 2.3.0
    6e9a4670 Bump github.com/urfave/cli/v2 from 2.17.1 to 2.19.2
    93332157 Bump github.com/onsi/gomega from 1.20.2 to 1.21.1
    4b984ddc Implement password input on the command line
    4507e46c Add recurring working areas to CONTRIBUTING
    fd4bb370 Bump github.com/urfave/cli/v2 from 2.16.3 to 2.17.1
    49249cbc Bump github.com/opencontainers/selinux from 1.10.1 to 1.10.2
    adac6827 Cleanup owners
    eb69454a Bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0
    373e7090 Bump github.com/urfave/cli/v2 from 2.16.2 to 2.16.3
    6f5588ba Bump github.com/docker/docker
    30d32dab Bump github.com/urfave/cli/v2 from 2.14.1 to 2.16.2
    fd1c34d3 Bump github.com/urfave/cli/v2 from 2.14.0 to 2.14.1
    46197a85 Bump github.com/urfave/cli/v2 from 2.11.2 to 2.14.0
    a07c04ee Print deleted digest when repo tags empty
    d3e8a304 Bump github.com/docker/go-units from 0.4.0 to 0.5.0
    5bf099af Bump github.com/onsi/gomega from 1.20.1 to 1.20.2
    74915650 Bump github.com/onsi/ginkgo/v2 from 2.1.5 to 2.1.6
    9bad5cb3 Ensure benchmarks are skipped during validation tests.
    fd16071d Bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.5
    c148f5b2 Bump github.com/onsi/gomega from 1.20.0 to 1.20.1
    778b8ed9 vendor: github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae
    5168c419 cmd/crictl: replace deprecated pkg/term
    0e31acb9 Update version references in docs and go.mod
    3efdd0f4 Bump github.com/opencontainers/runc from 1.1.3 to 1.1.4
    7abda56b Bump Kubernetes to v1.25.0
    1151eb16 Bump github.com/urfave/cli/v2 from 2.11.1 to 2.11.2
    a685ed61 No truncate PodID in ps command if --no-trunc exists
    7cf65e12 Migrate to native ginkgo v2

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2023-03-30 10:34:28 -04:00
parent 6ae8646348
commit ef43344fb3

View File

@ -16,7 +16,7 @@ What is not in scope for this project? \
non-exist on the kube-apiserver. \
"
SRCREV_cri-tools = "77d02a0356e9e1dca58d44e54dd0799e89856387"
SRCREV_cri-tools = "4daea44918cc34b63617c6c9e9923f43d47ddfdd"
SRC_URI = "\
git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \
file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \
@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2
GO_IMPORT = "import"
PV = "1.24.2+git${SRCREV_cri-tools}"
PV = "1.26.1+git${SRCREV_cri-tools}"
RPROVIDES:${PN} += "crictl"
PACKAGES =+ "${PN}-critest"
@ -63,7 +63,10 @@ do_compile() {
do_install() {
install -d ${D}${bindir}
install -m 755 -D ${S}/src/import/build/bin/* ${D}/${bindir}
for f in $(find ${S}/src/import/build/bin/ -type f); do
echo "installing $f to ${D}/${bindir}"
install -m 755 -D $f ${D}/${bindir}
done
}
FILES:${PN}-critest = "${bindir}/critest"