Skip to content

Commit 7a210ff

Browse files
authored
Merge pull request #35388 from saschagrunert/todo-format
CRI-O jobs: remove crun TODO
2 parents b2c821a + c3ba0a4 commit 7a210ff

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

jobs/e2e_node/crio/templates/base/crun-enabled.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
storage:
33
files:
44
- path: /etc/crio/crio.conf.d/99-crun.conf
5-
# Note: This also assumes the crun handler is enabled in the base crio.conf,
6-
# crun is installed, and the version of crun supports the `crun features` command.
7-
# All of this is true at the time of writing.
8-
# TODO(haircommander): This can be removed when runc 1.2.0 is released
95
contents:
106
local: 99-crun.conf
117
mode: 0644

jobs/e2e_node/crio/templates/crio_cgroupv2_userns.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ storage:
4747
mode: 0644
4848
overwrite: true
4949
- path: /etc/crio/crio.conf.d/99-crun.conf
50-
# Note: This also assumes the crun handler is enabled in the base crio.conf,
51-
# crun is installed, and the version of crun supports the `crun features` command.
52-
# All of this is true at the time of writing.
53-
# TODO(haircommander): This can be removed when runc 1.2.0 is released
5450
contents:
5551
local: 99-crun.conf
5652
mode: 0644

jobs/e2e_node/crio/templates/generate

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ done
8484
CRIO_SCRIPT_COMMIT=$(grep "CRIO_SCRIPT_COMMIT" "$BASE_PATH/env.yaml" | sed -rn 's/^.*CRIO_SCRIPT_COMMIT=([0-9a-f]+).*$/\1/p')
8585
CRIO_SCRIPT_URL="https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get"
8686
curl -fs "$CRIO_SCRIPT_URL" -o /dev/null || {
87-
echo "Error: CRIO_SCRIPT_COMMIT in $BASE_PATH/env.yaml is wrong. The get script was not found at: $CRIO_SCRIPT_URL" 1>&2
88-
exit 1
87+
echo "Error: CRIO_SCRIPT_COMMIT in $BASE_PATH/env.yaml is wrong. The get script was not found at: $CRIO_SCRIPT_URL" 1>&2
88+
exit 1
8989
}
9090

9191
CRIO_COMMIT=$(grep "CRIO_COMMIT" "$BASE_PATH/env.yaml" | sed -rn 's/^.*CRIO_COMMIT=([0-9a-f]+).*$/\1/p')

0 commit comments

Comments
 (0)