Skip to content

Commit

Permalink
chore: upgrade components version in test env
Browse files Browse the repository at this point in the history
upgrade cni to v1.5.0 to fix errror in TestCommit
upgrade nerdctl to v1.7.0
upgrade nydus-snapshotter to v0.13.13 and fix path error

"failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: error during container init: error running hook #0:
error running hook: exit status 1, stdout: , stderr: time=\"2024-06-03T03:13:32Z\" level=fatal msg=\"failed to call cni.
Setup: plugin type=\\\"firewall\\\" failed (add): running [/usr/sbin/iptables -t filter -N CNI-ISOLATION-STAGE-1 --wait]: exit status 4: iptables v1.8.7 (nf_tables):
CHAIN_USER_ADD failed (File exists): chain CNI-ISOLATION-STAGE-1\\n\"\nFailed to write to log,
write /var/lib/nerdctl/1935db59/containers/default/b66e8c33fdff0da78ceeb34fa2d0aa061961e68260fb13ec8c1210576e94eca1/oci-hook.createRuntime.log: file already closed: unknown"

Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
  • Loading branch information
Desiki-high committed Jun 5, 2024
1 parent 34ab06b commit 3cbdffd
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
sudo install -D -m 755 contrib/nydusify/cmd/nydusify /usr/bin/nydus-latest
sudo install -D -m 755 target/release/nydusd target/release/nydus-image /usr/bin/nydus-latest
sudo bash misc/prepare.sh
export NYDUS_STABLE_VERSION=$(curl https://api.github.com/repos/Dragonflyoss/nydus/releases/latest | jq -r '.tag_name')
export NYDUS_STABLE_VERSION_EXPORT="${NYDUS_STABLE_VERSION//./_}"
Expand Down
8 changes: 4 additions & 4 deletions misc/performance/containerd_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ oom_score = 0
[debug]
level = "debug"

[plugins."io.containerd.grpc.v1.cri"]
[plugins."io.containerd.grpc.v1.cri".containerd]
snapshotter = "nydus"
disable_snapshot_annotations = false
[plugins."io.containerd.grpc.v1.cri".containerd]
snapshotter = "nydus"
disable_snapshot_annotations = false
discard_unpacked_layers = false

[proxy_plugins]
[proxy_plugins.nydus]
Expand Down
6 changes: 5 additions & 1 deletion misc/performance/nydusd_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"type": "registry",
"config": {
"scheme": "http",
"host": "localhost:5000"
"host": "localhost:5077",
"skip_verify": true,
"timeout": 5,
"connect_timeout": 5,
"retry_limit": 4
}
},
"cache": {
Expand Down
14 changes: 7 additions & 7 deletions misc/prepare.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#!/bin/bash

SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
SNAPSHOTTER_CONFIG="misc/performance/snapshotter_config.toml"
if [ "$1" == "takeover_test" ]; then
SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
fi

readonly SNAPSHOTTER_VERSION=0.13.3
readonly NERDCTL_VERSION=1.7.0
readonly CNI_PLUGINS_VERSION=1.3.0
readonly SNAPSHOTTER_VERSION=0.13.13
readonly NERDCTL_VERSION=1.7.6
readonly CNI_PLUGINS_VERSION=1.5.0

# setup nerdctl and nydusd env
sudo install -D -m 755 contrib/nydusify/cmd/nydusify /usr/local/bin
sudo install -D -m 755 target/release/nydusd target/release/nydus-image /usr/local/bin
wget https://github.com/containerd/nydus-snapshotter/releases/download/v$SNAPSHOTTER_VERSION/nydus-snapshotter-v$SNAPSHOTTER_VERSION-x86_64.tgz
tar zxvf nydus-snapshotter-v$SNAPSHOTTER_VERSION-x86_64.tgz
sudo install -D -m 755 nydus-snapshotter/containerd-nydus-grpc /usr/local/bin
wget https://github.com/containerd/nydus-snapshotter/releases/download/v$SNAPSHOTTER_VERSION/nydus-snapshotter-v$SNAPSHOTTER_VERSION-linux-amd64.tar.gz
tar zxvf nydus-snapshotter-v$SNAPSHOTTER_VERSION-linux-amd64.tar.gz
sudo install -D -m 755 bin/containerd-nydus-grpc /usr/local/bin
sudo wget https://github.com/containerd/nerdctl/releases/download/v$NERDCTL_VERSION/nerdctl-$NERDCTL_VERSION-linux-amd64.tar.gz
sudo tar -xzvf nerdctl-$NERDCTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
sudo mkdir -p /opt/cni/bin
Expand Down

0 comments on commit 3cbdffd

Please sign in to comment.