Skip to content

CRI-O: use crun as default runtime #35792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Nov 12, 2025
Merged

CRI-O: use crun as default runtime #35792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -52,7 +52,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
}
Expand Down
10 changes: 1 addition & 9 deletions jobs/e2e_node/crio/crio_canary.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -55,14 +55,6 @@
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
},
{
"path": "/etc/crio/crio.conf.d/99-crun.conf",
"contents": {
"compression": "",
"source": "data:,%5Bcrio.runtime%5D%0Adefault_runtime%20%3D%20%22crun%22%0A"
},
"mode": 420
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio_drop_infra_ctr.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -52,7 +52,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
},
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio_eventedpleg.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -52,7 +52,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
},
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio_hugepages.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -52,7 +52,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
}
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio_imagefs.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -70,7 +70,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
},
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio_splitfs.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -70,7 +70,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
},
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/crio_swap1g.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -52,7 +52,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
}
Expand Down
12 changes: 2 additions & 10 deletions jobs/e2e_node/crio/crio_userns.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"path": "/etc/crio/crio.conf.d/20-crio.conf",
"contents": {
"compression": "gzip",
"source": "data:;base64,H4sIAAAAAAAC/7SQsW7zMAyEdz0F4X/+7b1Atu5ZuhWBIcu0pVYmDZJKExR990Jx2qFAiiydBBE83t33HCRxmxY/48FpmslbEexXzimcYQdNhxa6utRts/ZFmRrnNqEUsrTgwWWe+4xHzFUz4lDmxo3Ca59oEt8HE9jB5LOiG3HyJVt/1VaBFAo/b3692gYpdHDXb796i5dgRaXLacATXgPWvcYtTMlYfttjWmqHf/C0f9w/QPTHRDNYRKgnQMsQZuGywiDoXxUsJoXAOWOwxASCCx9xG79FJLDoDZLClE44fhf0RGy+KhR28H6p2XJIrZ7VcBlbLcPFp6k5G/i4SaDyuYfAxvF+Arf8DNX+R09jRvkL388AAAD//4dbqrt2AgAA"
"source": "data:;base64,H4sIAAAAAAAC/7RQPU/zQAze8yusvPOb7Ejd2LuwoSq6XJzEcLEj21daIf47uqawoCIYmE5nP19+HqOSNLSECQ+V0cTBs2K3SqJ4hh3ULXpsC6jdZs2TCddVtRE1s9OChyrJ1CU8YiqcAfs81dWgsnbEo4YuusIOxpAMqwHHkJN3V24hRM1fND9ea8r2UF2/3Rp8vgTLpm2iHk94DbipLMLkot/hhJdywz942N/v72AOR+IJfEYoEmC5j5NKXqFXDM8GPpNBlJQwOgmD4iJH3MYvMzL4HBzIYKQTDp8HBmbxUBgGO3iFWjM3EqmxszkuQ2O5v/jUJWcNbzcb0MzxJw0U3G8auOXnaP5/Djwk1L/wfQ8AAP//ee9iEHYCAAA="
},
"mode": 420
},
Expand All @@ -62,7 +62,7 @@
"path": "/etc/systemd/system.conf.d/10-env.conf",
"contents": {
"compression": "",
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3Da7cafc89fd6011acbc8668f325752ea8f6dde0ae%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dcae4e9ac33013ddcd57b258dfe6b845533f2fc84%22%0A"
},
"mode": 420
},
Expand All @@ -83,14 +83,6 @@
"source": "data:;base64,H4sIAAAAAAAC/0zMQa6DIBSF4TmrOIkTNXkJaNRXxk5chtaLklpo4JJ2+Q22g05Pzv8VSJGCNjZEnkZ99ckxvME0RlHguVMgUeAP3wNsRN91bY8aDUrnGbwTFtqsc9ZtOc3D6VRn+UvmXCmJciUzp4Nxn194+DVWqD+uuKWFDmKtWiWHRg+N/L/0UrwDAAD///9e1jyoAAAA"
},
"mode": 420
},
{
"path": "/etc/crio/crio.conf.d/99-crun.conf",
"contents": {
"compression": "",
"source": "data:,%5Bcrio.runtime%5D%0Adefault_runtime%20%3D%20%22crun%22%0A"
},
"mode": 420
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion jobs/e2e_node/crio/templates/base/20-crio.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ signature_policy = "/etc/crio/policy.json"
[crio.runtime]
log_level = "debug"
drop_infra_ctr = false
default_runtime = "runc"
default_runtime = "crun"

[crio.runtime.runtimes.crun]
runtime_path = "/usr/libexec/crio/crun"
Expand Down
2 changes: 0 additions & 2 deletions jobs/e2e_node/crio/templates/base/99-crun.conf
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions jobs/e2e_node/crio/templates/base/crun-enabled.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/base/env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
systemd:
units:
- name: configure-sysctl.service
Expand Down
4 changes: 0 additions & 4 deletions jobs/e2e_node/crio/templates/crio_canary.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ storage:
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
- path: /etc/crio/crio.conf.d/99-crun.conf
contents:
local: 99-crun.conf
mode: 0644
systemd:
units:
- name: configure-sysctl.service
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio_drop_infra_ctr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
- path: /etc/crio/crio.conf.d/30-crio-drop-infra-ctr.conf
contents:
local: 30-crio-drop-infra-ctr.conf
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio_eventedpleg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
- path: /etc/crio/crio.conf.d/40-evented-pleg.conf
contents:
local: 40-evented-pleg.conf
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio_hugepages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
systemd:
units:
- name: configure-sysctl.service
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio_imagefs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
- path: /etc/containers/storage.conf
contents:
local: 50-storage.conf
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio_splitfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
- path: /etc/containers/storage.conf
contents:
local: 60-storage-split-disk.conf
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/crio/templates/crio_swap1g.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ storage:
contents:
inline: |
[Manager]
DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
DefaultEnvironment="CRIO_SCRIPT_COMMIT=a7cafc89fd6011acbc8668f325752ea8f6dde0ae"
DefaultEnvironment="CRIO_COMMIT=cae4e9ac33013ddcd57b258dfe6b845533f2fc84"
systemd:
units:
- name: configure-sysctl.service
Expand Down
Loading