diff --git a/.ci/data/crio.service b/.ci/data/crio.service deleted file mode 100644 index 97328540b..000000000 --- a/.ci/data/crio.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=CRI-O daemon -Documentation=https://github.com/kubernetes-incubator/cri-o - -[Service] -ExecStart=/usr/local/bin/crio --log-level debug -Restart=on-failure -RestartSec=5 - -[Install] -WantedBy=multi-user.target diff --git a/.ci/install_crio.sh b/.ci/install_crio.sh index 050a68864..d4233650d 100755 --- a/.ci/install_crio.sh +++ b/.ci/install_crio.sh @@ -91,11 +91,24 @@ echo "Set Clear containers as default runtime in CRI-O for untrusted workloads" sudo sed -i 's/default_workload_trust = "trusted"/default_workload_trust = "untrusted"/' "$crio_config_file" sudo sed -i 's/runtime_untrusted_workload = ""/runtime_untrusted_workload = "\/usr\/local\/bin\/cc-runtime"/' "$crio_config_file" -service_path="/etc/systemd/system" -crio_service_file="${cidir}/data/crio.service" - -echo "Install crio service (${crio_service_file})" -sudo cp "${crio_service_file}" "${service_path}" +service_path="/etc/systemd/system/crio.service" + +echo "Install crio service (${service_path})" +cat << EOT | sudo tee ${service_path} +[Unit] +Description=CRI-O daemon +Documentation=https://github.com/kubernetes-incubator/cri-o + +[Service] +Environment="HTTP_PROXY=${http_proxy}" +Environment="HTTPS_PROXY=${https_proxy}" +ExecStart=/usr/local/bin/crio --log-level debug +Restart=on-failure +RestartSec=5 + +[Install] +WantedBy=multi-user.target +EOT echo "Reload systemd services" sudo systemctl daemon-reload