kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12177 from hakman/hardcode_flatcar_containerd_exec 

Hardcode Flatcar containerd exec command
This commit is contained in:
Kubernetes Prow Robot 2021-08-19 00:31:26 -07:00 committed by GitHub
parent ecb85a207a 84bdfd900d
commit 3ddafa3f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodeup/pkg/model/containerd.go
View File

@ -249,8 +249,10 @@ func (b *ContainerdBuilder) buildSystemdServiceOverrideContainerOS(c *fi.ModelBu
func (b *ContainerdBuilder) buildSystemdServiceOverrideFlatcar(c *fi.ModelBuilderContext) {
lines := []string{
"[Service]",
"Environment=CONTAINERD_CONFIG=" + b.containerdConfigFilePath(),
"EnvironmentFile=/etc/environment",
"Environment=CONTAINERD_CONFIG=" + b.containerdConfigFilePath(),
"ExecStart=",
"ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}",
}
contents := strings.Join(lines, "\n")

4
nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml
View File

@ -46,8 +46,10 @@ afterFiles:
- /etc/containerd/config-kops.toml
contents: |-
[Service]
Environment=CONTAINERD_CONFIG=/etc/containerd/config-kops.toml
EnvironmentFile=/etc/environment
Environment=CONTAINERD_CONFIG=/etc/containerd/config-kops.toml
ExecStart=
ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
onChangeExecute:
- - systemctl
- daemon-reload