Skip to content

Commit 8dae319

Browse files
saschagrunertsaschagrunert
committed
crio e2e: allow canary CRI-O updates
Add a global env file to allow canary CRI-O script and version updates. We now also override the drop infra config from root so that we can dedup the configurations. Signed-off-by: Sascha Grunert <[email protected]>
1 parent 346e156 commit 8dae319

27 files changed

+218
-210
lines changed

‎jobs/e2e_node/crio/README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,9 @@ gcloud compute instances create \
6161

6262
Accessing the virtual machine should be now possible by using the external IP of
6363
the instance.
64+
65+
# Change CRI-O versions
66+
67+
To change the version of CRI-O being used for a single ignition file, just copy
68+
[env.yaml](./templates/base/env.yaml) and adapt
69+
[`./templates/generate`](./templates/generate) accordingly.

‎jobs/e2e_node/crio/crio_cgroupv1.ign‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
},
5252
"mode": 420
5353
},
54+
{
55+
"path": "/etc/systemd/system.conf.d/10-env.conf",
56+
"contents": {
57+
"compression": "",
58+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
59+
},
60+
"mode": 420
61+
},
5462
{
5563
"path": "/etc/crio/crio.conf.d/42-checkpoint-enabled.conf",
5664
"contents": {
@@ -79,7 +87,7 @@
7987
"name": "selinux-install.service"
8088
},
8189
{
82-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=0083f3f8aa9e4368292c6fc4879e56f615e46585\"\nEnvironment=\"CRIO_COMMIT=bdcf72ff47866e1377cf1ba5372c7fc53ed9de99\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
90+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
8391
"enabled": true,
8492
"name": "crio-install.service"
8593
},

‎jobs/e2e_node/crio/crio_cgroupv1_eventedpleg.ign‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
},
5252
"mode": 420
5353
},
54+
{
55+
"path": "/etc/systemd/system.conf.d/10-env.conf",
56+
"contents": {
57+
"compression": "",
58+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
59+
},
60+
"mode": 420
61+
},
5462
{
5563
"path": "/etc/crio/crio.conf.d/40-evented-pleg.conf",
5664
"contents": {
@@ -79,7 +87,7 @@
7987
"name": "selinux-install.service"
8088
},
8189
{
82-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=0083f3f8aa9e4368292c6fc4879e56f615e46585\"\nEnvironment=\"CRIO_COMMIT=bdcf72ff47866e1377cf1ba5372c7fc53ed9de99\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
90+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
8391
"enabled": true,
8492
"name": "crio-install.service"
8593
},

‎jobs/e2e_node/crio/crio_cgroupv1_hugepages.ign‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@
5050
"source": "data:text/plain;base64,R0NFX1NTSF9QVUJMSUNfS0VZX0ZJTEVfQ09OVEVOVA=="
5151
},
5252
"mode": 420
53+
},
54+
{
55+
"path": "/etc/systemd/system.conf.d/10-env.conf",
56+
"contents": {
57+
"compression": "",
58+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
59+
},
60+
"mode": 420
5361
}
5462
]
5563
},
@@ -71,7 +79,7 @@
7179
"name": "selinux-install.service"
7280
},
7381
{
74-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=0083f3f8aa9e4368292c6fc4879e56f615e46585\"\nEnvironment=\"CRIO_COMMIT=bdcf72ff47866e1377cf1ba5372c7fc53ed9de99\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
82+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
7583
"enabled": true,
7684
"name": "crio-install.service"
7785
},

‎jobs/e2e_node/crio/crio_cgroupv2.ign‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@
4747
"source": "data:text/plain;base64,R0NFX1NTSF9QVUJMSUNfS0VZX0ZJTEVfQ09OVEVOVA=="
4848
},
4949
"mode": 420
50+
},
51+
{
52+
"path": "/etc/systemd/system.conf.d/10-env.conf",
53+
"contents": {
54+
"compression": "",
55+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
56+
},
57+
"mode": 420
5058
}
5159
]
5260
},
@@ -68,7 +76,7 @@
6876
"name": "selinux-install.service"
6977
},
7078
{
71-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=0083f3f8aa9e4368292c6fc4879e56f615e46585\"\nEnvironment=\"CRIO_COMMIT=bdcf72ff47866e1377cf1ba5372c7fc53ed9de99\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
79+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
7280
"enabled": true,
7381
"name": "crio-install.service"
7482
},

‎jobs/e2e_node/crio/crio_cgroupv2_drop_infra_ctr.ign‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"mode": 420
2727
},
2828
{
29-
"path": "/etc/crio/crio.conf.d/20-crio-drop-infra-ctr.conf",
29+
"path": "/etc/crio/crio.conf.d/20-crio.conf",
3030
"contents": {
3131
"compression": "gzip",
32-
"source": "data:;base64,H4sIAAAAAAAC/7SP0UrFMAyG7/MUY/duT3CeREbpaXN6Im0y0kT07aVuIiiIIF6Vhv/P9+UxKclCLRbcoFPhaK4YdqmUXqfLNK9oaR2h9ZgtT114BjiK6mzUcIMqJVR8xjo6Ga9eZsgqeyC+aQzJdLpMpo6Q8Ra9WjirI6/O6evKj7cvSZ03OL9hj3Z/9/Kua6UrvuDpN3IzNGEy0Z9ywu37CZ+8YfMb3mH9d55ht4d75FxR/4P7FgAA//9Pq5nE4wEAAA=="
32+
"source": "data:;base64,H4sIAAAAAAAC/7SP0UrFMAyG7/MUY/duT3CeREbp6bIukiYjTUXfXuomgoII4lVp+P98Xx6TkU5UYsYFKmWJ3gzDoUzpdbgN44ye5h6az9n0VFVGgLNoTZwKLsCaA+Mzcu+seG95hNX0CCSbxZDchtuwRa4IK26xsYer2wvWJH3d+fHWKVmTBa5vOKLv72Kt2sx0xxe8BHtuhKJCrvZTTqV8v+GT121+wzut/85zrP6wR1kZ7T+4bwEAAP//V7kNseQBAAA="
3333
},
3434
"mode": 420
3535
},
@@ -47,6 +47,22 @@
4747
"source": "data:text/plain;base64,R0NFX1NTSF9QVUJMSUNfS0VZX0ZJTEVfQ09OVEVOVA=="
4848
},
4949
"mode": 420
50+
},
51+
{
52+
"path": "/etc/systemd/system.conf.d/10-env.conf",
53+
"contents": {
54+
"compression": "",
55+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
56+
},
57+
"mode": 420
58+
},
59+
{
60+
"path": "/etc/crio/crio.conf.d/30-crio-drop-infra-ctr.conf",
61+
"contents": {
62+
"compression": "",
63+
"source": "data:,%5Bcrio.runtime%5D%0Adrop_infra_ctr%20%3D%20true%0A"
64+
},
65+
"mode": 420
5066
}
5167
]
5268
},
@@ -68,7 +84,7 @@
6884
"name": "selinux-install.service"
6985
},
7086
{
71-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=52aa3c2a31ccc9623962e9e338b6585267d6f3f4\"\nEnvironment=\"CRIO_COMMIT=1c04ca9768e535cf22017da6e6cee620bb3a6431\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
87+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
7288
"enabled": true,
7389
"name": "crio-install.service"
7490
},

‎jobs/e2e_node/crio/crio_cgroupv2_hugepages.ign‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@
4747
"source": "data:text/plain;base64,R0NFX1NTSF9QVUJMSUNfS0VZX0ZJTEVfQ09OVEVOVA=="
4848
},
4949
"mode": 420
50+
},
51+
{
52+
"path": "/etc/systemd/system.conf.d/10-env.conf",
53+
"contents": {
54+
"compression": "",
55+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
56+
},
57+
"mode": 420
5058
}
5159
]
5260
},
@@ -68,7 +76,7 @@
6876
"name": "selinux-install.service"
6977
},
7078
{
71-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=0083f3f8aa9e4368292c6fc4879e56f615e46585\"\nEnvironment=\"CRIO_COMMIT=bdcf72ff47866e1377cf1ba5372c7fc53ed9de99\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
79+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
7280
"enabled": true,
7381
"name": "crio-install.service"
7482
},

‎jobs/e2e_node/crio/crio_cgroupv2_imagefs.ign‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
},
6767
"mode": 420
6868
},
69+
{
70+
"path": "/etc/systemd/system.conf.d/10-env.conf",
71+
"contents": {
72+
"compression": "",
73+
"source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0083f3f8aa9e4368292c6fc4879e56f615e46585%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3Dbdcf72ff47866e1377cf1ba5372c7fc53ed9de99%22%0A"
74+
},
75+
"mode": 420
76+
},
6977
{
7078
"path": "/etc/containers/storage.conf",
7179
"contents": {
@@ -106,7 +114,7 @@
106114
"name": "selinux-install.service"
107115
},
108116
{
109-
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nEnvironment=\"SCRIPT_COMMIT=0083f3f8aa9e4368292c6fc4879e56f615e46585\"\nEnvironment=\"CRIO_COMMIT=bdcf72ff47866e1377cf1ba5372c7fc53ed9de99\"\n\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
117+
"contents": "[Unit]\nDescription=Download and install crio binaries and configurations.\nAfter=selinux-install.service\n\n[Service]\nType=oneshot\nExecStartPre=mount /tmp /tmp -o remount,exec,suid\nExecStartPre=mount -o remount,rw /dev/sda4 /usr\nExecStartPre=bash -c '\\\n curl --fail --retry 5 --retry-delay 3 --silent --show-error \\\n https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT/get |\\\n bash -s -- -t $CRIO_COMMIT'\nExecStartPre=rm -f /etc/cni/net.d/87-podman-bridge.conflist\nExecStartPre=rm -f /etc/crio/crio.conf.d/10-crio.conf\nExecStartPre=mv /etc/cni/net.d/10-crio-bridge.conflist.disabled /etc/cni/net.d/10-crio-bridge.conflist\nExecStart=systemctl enable --now crio.service\nRestart=on-failure\n\n[Install]\nWantedBy=multi-user.target\n",
110118
"enabled": true,
111119
"name": "crio-install.service"
112120
},

0 commit comments

Comments
 (0)