Merge pull request cri-o#7619 from saschagrunert/conmon

Update conmon to v2.1.10

.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
 

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

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
 }
 

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