mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-08-17 03:57:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: set CRI config to /etc/cri/containerd.toml

Browse Source 
This changes the CRI specific containerd instance's config to a
different path.

Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
This commit is contained in:
Andrew Rynhard 2019-12-04 23:20:17 +00:00
parent 9d9b958fba
commit d4c202438c
8 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -239,7 +239,7 @@ COPY images/networkd.tar /rootfs/usr/images/
# symlinks to avoid accidentally cleaning them up. # symlinks to avoid accidentally cleaning them up.
COPY ./hack/cleanup.sh /toolchain/bin/cleanup.sh COPY ./hack/cleanup.sh /toolchain/bin/cleanup.sh
RUN cleanup.sh /rootfs RUN cleanup.sh /rootfs
COPY hack/containerd.toml /rootfs/etc/containerd/cri.toml COPY hack/containerd.toml /rootfs/etc/cri/containerd.toml
RUN touch /rootfs/etc/resolv.conf RUN touch /rootfs/etc/resolv.conf
RUN touch /rootfs/etc/hosts RUN touch /rootfs/etc/hosts
RUN touch /rootfs/etc/os-release RUN touch /rootfs/etc/os-release

2
internal/app/machined/pkg/system/runner/containerd/containerd_test.go
View File

@ -76,7 +76,7 @@ func (suite *ContainerdSuite) SetupSuite() {
"--address", suite.containerdAddress, "--address", suite.containerdAddress,
"--state", stateDir, "--state", stateDir,
"--root", rootDir, "--root", rootDir,
"--config", "/etc/containerd/cri.toml", "--config", constants.CRIContainerdConfig,
}, },
} }

2
internal/app/machined/pkg/system/runner/cri/cri_test.go
View File

@ -67,7 +67,7 @@ func (suite *CRISuite) SetupSuite() {
"--address", suite.containerdAddress, "--address", suite.containerdAddress,
"--state", stateDir, "--state", stateDir,
"--root", rootDir, "--root", rootDir,
"--config", "/etc/containerd/cri.toml", "--config", constants.CRIContainerdConfig,
}, },
} }

2
internal/app/machined/pkg/system/services/containerd.go
View File

@ -61,7 +61,7 @@ func (c *Containerd) Runner(config runtime.Configurator) (runner.Runner, error)
"--address", "--address",
constants.ContainerdAddress, constants.ContainerdAddress,
"--config", "--config",
"/etc/containerd/cri.toml", constants.CRIContainerdConfig,
}, },
} }

2
internal/pkg/containers/containerd/containerd_test.go
View File

@ -92,7 +92,7 @@ func (suite *ContainerdSuite) SetupSuite() {
"--address", suite.containerdAddress, "--address", suite.containerdAddress,
"--state", stateDir, "--state", stateDir,
"--root", rootDir, "--root", rootDir,
"--config", "/etc/containerd/cri.toml", "--config", constants.CRIContainerdConfig,
}, },
} }

2
internal/pkg/containers/cri/cri_test.go
View File

@ -75,7 +75,7 @@ func (suite *CRISuite) SetupSuite() {
"--address", suite.containerdAddress, "--address", suite.containerdAddress,
"--state", stateDir, "--state", stateDir,
"--root", rootDir, "--root", rootDir,
"--config", "/etc/containerd/cri.toml", "--config", constants.CRIContainerdConfig,
}, },
} }

2
internal/pkg/cri/cri_test.go
View File

@ -65,7 +65,7 @@ func (suite *CRISuite) SetupSuite() {
"--address", suite.containerdAddress, "--address", suite.containerdAddress,
"--state", stateDir, "--state", stateDir,
"--root", rootDir, "--root", rootDir,
"--config", "/etc/containerd/cri.toml", "--config", constants.CRIContainerdConfig,
}, },
} }

3
pkg/constants/constants.go
View File

@ -194,6 +194,9 @@ const (
// SystemContainerdAddress is the path to the system containerd socket. // SystemContainerdAddress is the path to the system containerd socket.
SystemContainerdAddress = SystemRunPath + "/containerd/containerd.sock" SystemContainerdAddress = SystemRunPath + "/containerd/containerd.sock"
// CRIContainerdConfig is the path to the config for the containerd instance that provides the CRI.
CRIContainerdConfig = "/etc/cri/containerd.toml"
// TalosConfigEnvVar is the environment variable for setting the Talos configuration file path. // TalosConfigEnvVar is the environment variable for setting the Talos configuration file path.
TalosConfigEnvVar = "TALOSCONFIG" TalosConfigEnvVar = "TALOSCONFIG"