mirror of
https://github.com/siderolabs/talos.git
synced 2025-12-09 19:41:41 +01:00
chore: move enabling SELinux by default to 1.10
For 1.9, we keep it disabled until it gets more production ready in 1.10. It still can be enabled with `selinux=1`. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
parent
ef69c9d39b
commit
db1c707689
@ -42,21 +42,6 @@ Talos Linux now supports running Kubernetes pods with user namespaces enabled.
|
|||||||
Refer to the [documentation](https://www.talos.dev/v1.9/kubernetes-guides/configuration/usernamespace/) for more information.
|
Refer to the [documentation](https://www.talos.dev/v1.9/kubernetes-guides/configuration/usernamespace/) for more information.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
[notes.apparmor]
|
|
||||||
title = "AppArmor"
|
|
||||||
description = """\
|
|
||||||
Talos Linux starting with v1.9 will ship with SELinux LSM enabled by default.
|
|
||||||
If you need to use AppArmor LSM add the following to the machine configuration:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
machine:
|
|
||||||
install:
|
|
||||||
extraKernelArgs:
|
|
||||||
- -selinux
|
|
||||||
- lsm=lockdown,capability,yama,apparmor,bpf
|
|
||||||
- apparmor=1
|
|
||||||
```
|
|
||||||
"""
|
|
||||||
|
|
||||||
[notes.auditd]
|
[notes.auditd]
|
||||||
title = "Auditd"
|
title = "Auditd"
|
||||||
|
|||||||
@ -350,7 +350,7 @@ func (i *Imager) buildCmdline() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if quirks.New(i.prof.Version).SupportsSELinux() {
|
if quirks.New(i.prof.Version).SupportsSELinux() {
|
||||||
// Talos 1.9 introduces SELinux in permissive mode
|
// Talos 1.10 introduces SELinux in permissive mode
|
||||||
cmdline.Append(constants.KernelParamSELinux, "1")
|
cmdline.Append(constants.KernelParamSELinux, "1")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -89,7 +89,7 @@ func TestImager(t *testing.T) {
|
|||||||
expected: "talos.platform=metal console=ttyAMA0 console=tty0 init_on_alloc=1 slab_nomerge pti=on consoleblank=0 nvme_core.io_timeout=4294967295 printk.devkmsg=on ima_template=ima-ng ima_appraise=fix ima_hash=sha512", //nolint:lll
|
expected: "talos.platform=metal console=ttyAMA0 console=tty0 init_on_alloc=1 slab_nomerge pti=on consoleblank=0 nvme_core.io_timeout=4294967295 printk.devkmsg=on ima_template=ima-ng ima_appraise=fix ima_hash=sha512", //nolint:lll
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "cmdline-1.9-amd64",
|
name: "cmdline-1.10-amd64",
|
||||||
|
|
||||||
prof: profile.Profile{
|
prof: profile.Profile{
|
||||||
BaseProfileName: "metal",
|
BaseProfileName: "metal",
|
||||||
@ -98,13 +98,13 @@ func TestImager(t *testing.T) {
|
|||||||
Kind: profile.OutKindCmdline,
|
Kind: profile.OutKindCmdline,
|
||||||
OutFormat: profile.OutFormatRaw,
|
OutFormat: profile.OutFormatRaw,
|
||||||
},
|
},
|
||||||
Version: "1.9.0",
|
Version: "1.10.0",
|
||||||
},
|
},
|
||||||
|
|
||||||
expected: "talos.platform=metal console=tty0 selinux=1 init_on_alloc=1 slab_nomerge pti=on consoleblank=0 nvme_core.io_timeout=4294967295 printk.devkmsg=on ima_template=ima-ng ima_appraise=fix ima_hash=sha512", //nolint:lll
|
expected: "talos.platform=metal console=tty0 selinux=1 init_on_alloc=1 slab_nomerge pti=on consoleblank=0 nvme_core.io_timeout=4294967295 printk.devkmsg=on ima_template=ima-ng ima_appraise=fix ima_hash=sha512", //nolint:lll
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "cmdline-1.9-arm64",
|
name: "cmdline-1.10-arm64",
|
||||||
|
|
||||||
prof: profile.Profile{
|
prof: profile.Profile{
|
||||||
BaseProfileName: "metal",
|
BaseProfileName: "metal",
|
||||||
@ -113,7 +113,7 @@ func TestImager(t *testing.T) {
|
|||||||
Kind: profile.OutKindCmdline,
|
Kind: profile.OutKindCmdline,
|
||||||
OutFormat: profile.OutFormatRaw,
|
OutFormat: profile.OutFormatRaw,
|
||||||
},
|
},
|
||||||
Version: "1.9.0",
|
Version: "1.10.0",
|
||||||
},
|
},
|
||||||
|
|
||||||
expected: "talos.platform=metal console=ttyAMA0 console=tty0 selinux=1 init_on_alloc=1 slab_nomerge pti=on consoleblank=0 nvme_core.io_timeout=4294967295 printk.devkmsg=on ima_template=ima-ng ima_appraise=fix ima_hash=sha512", //nolint:lll
|
expected: "talos.platform=metal console=ttyAMA0 console=tty0 selinux=1 init_on_alloc=1 slab_nomerge pti=on consoleblank=0 nvme_core.io_timeout=4294967295 printk.devkmsg=on ima_template=ima-ng ima_appraise=fix ima_hash=sha512", //nolint:lll
|
||||||
|
|||||||
@ -138,7 +138,7 @@ func (q Quirks) SkipDataPartitions() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// minVersionSELinux is the version that enabled SELinux and added respective parameters.
|
// minVersionSELinux is the version that enabled SELinux and added respective parameters.
|
||||||
var minVersionSELinux = semver.MustParse("1.9.0")
|
var minVersionSELinux = semver.MustParse("1.10.0")
|
||||||
|
|
||||||
// SupportsSELinux returns true if the Talos version supports already has console=ttyS0 kernel argument.
|
// SupportsSELinux returns true if the Talos version supports already has console=ttyS0 kernel argument.
|
||||||
func (q Quirks) SupportsSELinux() bool {
|
func (q Quirks) SupportsSELinux() bool {
|
||||||
|
|||||||
@ -84,9 +84,6 @@ func (p *provisioner) createNode(state *vm.State, clusterReq provision.ClusterRe
|
|||||||
// Talos config
|
// Talos config
|
||||||
cmdline.Append("talos.platform", constants.PlatformMetal)
|
cmdline.Append("talos.platform", constants.PlatformMetal)
|
||||||
|
|
||||||
// SELinux
|
|
||||||
cmdline.Append(constants.KernelParamSELinux, "1")
|
|
||||||
|
|
||||||
// add overrides
|
// add overrides
|
||||||
if nodeReq.ExtraKernelArgs != nil {
|
if nodeReq.ExtraKernelArgs != nil {
|
||||||
if err = cmdline.AppendAll(
|
if err = cmdline.AppendAll(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user