From e1f85108437d1d1777200caa3e10f560fb07595c Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 21 Dec 2023 11:15:21 +0100 Subject: [PATCH] Update conmon to v2.1.10 Signed-off-by: Sascha Grunert --- .github/workflows/integration.yml | 1 + dependencies.yaml | 2 +- scripts/github-actions-setup | 16 +++++++++------- scripts/versions | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3a442712fca..5aca24bb2f4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,6 +10,7 @@ on: pull_request: env: GO_VERSION: '1.21' + CONMON_BINARY: /usr/local/bin/conmon # from: scripts/github-actions-setup permissions: contents: read diff --git a/dependencies.yaml b/dependencies.yaml index 8f162daa177..9e4f7a8e977 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -38,7 +38,7 @@ dependencies: match: version - name: conmon - version: v2.1.8 + version: v2.1.10 refPaths: - path: scripts/versions match: conmon diff --git a/scripts/github-actions-setup b/scripts/github-actions-setup index 27f4a6b95f8..b5d7d81f641 100755 --- a/scripts/github-actions-setup +++ b/scripts/github-actions-setup @@ -22,6 +22,10 @@ main() { install_buildah } +curl_retry() { + sudo curl -sSfL --retry 5 --retry-delay 3 "$@" +} + prepare_system() { sudo systemctl stop docker || true sudo ufw disable || true @@ -59,16 +63,14 @@ install_bats() { } install_conmon() { - git clone https://github.com/containers/conmon - pushd conmon - git checkout "${VERSIONS["conmon"]}" - sudo make PREFIX=/ all install.bin - popd - sudo rm -rf conmon + CONMON_BINARY=/usr/local/bin/conmon + curl_retry "https://github.com/containers/conmon/releases/download/${VERSIONS["conmon"]}/conmon.$GOARCH" \ + -o $CONMON_BINARY + sudo chmod +x $CONMON_BINARY } install_conmonrs() { - curl -sSfL --retry 5 --retry-delay 3 https://raw.githubusercontent.com/containers/conmon-rs/main/scripts/get | + curl_retry https://raw.githubusercontent.com/containers/conmon-rs/main/scripts/get | sudo -E PATH="$PATH" bash -s -- -a "$GOARCH" -o /usr/bin/conmonrs } diff --git a/scripts/versions b/scripts/versions index 817b0ff981b..3661d7ff491 100755 --- a/scripts/versions +++ b/scripts/versions @@ -4,7 +4,7 @@ set -euo pipefail # Versions to be used declare -A VERSIONS=( ["cni-plugins"]=v1.4.0 - ["conmon"]=v2.1.8 + ["conmon"]=v2.1.10 ["conmon-rs"]=v0.6.1 ["cri-tools"]=v1.29.0 ["runc"]=v1.1.9