Skip to content
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

Jump to bottom

Adds cri-dockerd initd service #1766

Merged
merged 7 commits into from
Mar 17, 2022
Merged

Adds cri-dockerd initd service #1766

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f52a0f
WIP - adds cri-dockerd initd service
Nino-K Mar 8, 2022
66a4417
add cri-dockerd init.d in wsl and lima
Nino-K Mar 10, 2022
e67718e
bump wsl and lima release version
Nino-K Mar 10, 2022
391a15a
bad syntax fix
Nino-K Mar 10, 2022
f820c5f
fix the file name
Nino-K Mar 10, 2022
4db992a
remove --docker and enable cri-dockerd for all k3s versions
Nino-K Mar 11, 2022
1baee05
Fix container endpoint URI
Nino-K Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/assets/scripts/cri-dockerd.initd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/sbin/openrc-run

# This script is used to manage cri-dockerd via OpenRC.

# shellcheck shell=ksh

name="cri-dockerd"
description="Rancher Desktop Shim for Docker Engine"


supervisor=supervise-daemon
command=/usr/bin/cri-dockerd"
Nino-K marked this conversation as resolved.
Show resolved Hide resolved
command_args="--container-runtime-endpoint /run/cri-dockerd.sock --network-plugin="

CRI_DOCKERD_LOGFILE="${CRI_DOCKERD_LOGFILE:-${LOG_DIR:-/var/log}/${RC_SVCNAME}.log}"
output_log="'${CRI_DOCKERD_LOGFILE}'"
error_log="'${CRI_DOCKERD_LOGFILE}'"

depend() {
need docker
}
3 changes: 3 additions & 0 deletions src/assets/scripts/service-k3s.initd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ fi
ENGINE="${ENGINE:-containerd}"

depend() {
if [ "${ENGINE}" == "moby" ]; then
Nino-K marked this conversation as resolved.
Show resolved Hide resolved
need cri-dockerd
fi
after network-online
want cgroups
}
Expand Down
6 changes: 6 additions & 0 deletions src/k8s-engine/lima.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import DEFAULT_CONFIG from '@/assets/lima-config.yaml';
import NETWORKS_CONFIG from '@/assets/networks-config.yaml';
import FLANNEL_CONFLIST from '@/assets/scripts/10-flannel.conflist';
import CONTAINERD_CONFIG from '@/assets/scripts/k3s-containerd-config.toml';
import SERVICE_CRI_DOCKERD_SCRIPT from '@/assets/scripts/service-cri-dockerd.initd';
import INSTALL_K3S_SCRIPT from '@/assets/scripts/install-k3s';
import SERVICE_K3S_SCRIPT from '@/assets/scripts/service-k3s.initd';
import LOGROTATE_K3S_SCRIPT from '@/assets/scripts/logrotate-k3s';
Expand Down Expand Up @@ -1214,6 +1215,11 @@ export default class LimaBackend extends events.EventEmitter implements K8s.Kube
if (!this.cfg?.options.traefik) {
config.ADDITIONAL_ARGS += ' --disable traefik';
}
await this.writeFile('/etc/init.d/cri-dockerd', SERVICE_CRI_DOCKERD_SCRIPT, 0o755);
await this.writeConf('cri-dockerd', {
LOG_DIR: paths.logs,
ENGINE: this.#currentContainerEngine,
});
await this.writeFile('/etc/init.d/k3s', SERVICE_K3S_SCRIPT, 0o755);
await this.writeConf('k3s', config);
await this.writeFile('/etc/logrotate.d/k3s', LOGROTATE_K3S_SCRIPT);
Expand Down
6 changes: 6 additions & 0 deletions src/k8s-engine/wsl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import ProgressTracker from './progressTracker';
import FLANNEL_CONFLIST from '@/assets/scripts/10-flannel.conflist';
import CONTAINERD_CONFIG from '@/assets/scripts/k3s-containerd-config.toml';
import INSTALL_K3S_SCRIPT from '@/assets/scripts/install-k3s';
import SERVICE_SCRIPT_CRI_DOCKERD from '@/assets/scripts/service-cri-dockerd.initd';
import SERVICE_SCRIPT_K3S from '@/assets/scripts/service-k3s.initd';
import SERVICE_SCRIPT_DOCKERD from '@/assets/scripts/service-wsl-dockerd.initd';
import LOGROTATE_K3S_SCRIPT from '@/assets/scripts/logrotate-k3s';
Expand Down Expand Up @@ -1212,6 +1213,11 @@ export default class WSLBackend extends events.EventEmitter implements K8s.Kuber
const rotateConf = LOGROTATE_K3S_SCRIPT.replace(/\r/g, '')
.replace('/var/log', logPath);

await this.writeFile('/etc/init.d/cri-dockerd', SERVICE_SCRIPT_CRI_DOCKERD, { permissions: 0o755 });
await this.writeConf('cri-dockerd', {
ENGINE: this.#currentContainerEngine,
LOG_DIR: logPath,
});
await this.writeFile('/etc/init.d/k3s', SERVICE_SCRIPT_K3S, { permissions: 0o755 });
await this.writeFile('/etc/logrotate.d/k3s', rotateConf);
await this.execCommand('mkdir', '-p', '/etc/cni/net.d');
Expand Down